jellyfin/jellyfin-media-player
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-media-player.git synced 2024-11-27 00:00:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix Qt 5.15 QTextStream deprecation warnings

Browse Source 
- QTextStream::endl was deprecated in 5.15 and removed in 6.0. The new
  alternative, QT::endl is not available < 5.15, so just use literal
  newlines and flush where appropirate (QT::endl appends newline and
  flushes the stream). QTextStream should handle the "\n" to "\r\n"
  translation internally.
- QTextStream::flush was also deprecated in 5.15 and the alternative
  QT::flush is also not available in < 5.15. Just flush the stream
  directly.
This commit is contained in:
Eivind Uggedal 2021-04-13 10:19:38 +02:00
parent e161d06f8a
commit b0541484b3
4 changed files with 67 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
external/qslog/QsLogDestFile.cpp vendored
View File

@ -141,7 +141,7 @@ void QsLogging::FileDestination::write(const QString& message, Level)
if (mRotationStrategy->shouldRotate())
rotate();
mOutputStream << message << endl;
mOutputStream << message << "\n";
mOutputStream.flush();
}

16
src/display/DisplayComponent.cpp
View File

@ -285,29 +285,29 @@ QString DisplayComponent::debugInformation()
{
QString debugInfo;
QTextStream stream(&debugInfo);
stream << "Display" << endl;
stream << "Display\n";
if (!m_displayManager)
{
stream << " (no DisplayManager initialized)" << endl;
stream << " (no DisplayManager initialized)\n";
}
else
{
int display = getApplicationDisplay(true);
int mode = display < 0 ? -1 : m_displayManager->getCurrentDisplayMode(display);
stream << " Current screen: " << displayName(display) << endl;
stream << " Current screen: " << displayName(display) << "\n";
if (display >= 0)
stream << " Current mode: " << modePretty(display, mode) << endl;
stream << " Current mode: " << modePretty(display, mode) << "\n";
if (m_displayManager->isValidDisplayMode(m_lastDisplay, m_lastVideoMode))
{
stream << " Switch back on screen: " << displayName(m_lastDisplay) << endl;
stream << " Switch back to mode: " << modePretty(m_lastDisplay, m_lastVideoMode) << endl;
stream << " Switch back on screen: " << displayName(m_lastDisplay) << "\n";
stream << " Switch back to mode: " << modePretty(m_lastDisplay, m_lastVideoMode) << "\n";
}
}
stream << endl;
stream << flush;
stream << "\n";
stream.flush();
return debugInfo;
}

82
src/player/PlayerComponent.cpp
View File

@ -1491,74 +1491,74 @@ QString PlayerComponent::videoInformation() const
if (mpv::qt::get_property(m_mpv, "idle-active").toBool())
return "";
info << "File:" << endl;
info << "URL: " << MPV_PROPERTY("path") << endl;
info << "Container: " << MPV_PROPERTY("file-format") << endl;
info << "File:\n";
info << "URL: " << MPV_PROPERTY("path") << "\n";
info << "Container: " << MPV_PROPERTY("file-format") << "\n";
info << "Native seeking: " << ((MPV_PROPERTY_BOOL("seekable") &&
!MPV_PROPERTY_BOOL("partially-seekable"))
? "yes" : "no") << endl;
info << endl;
info << "Video:" << endl;
info << "Codec: " << MPV_PROPERTY("video-codec") << endl;
? "yes" : "no") << "\n";
info << "\n";
info << "Video:\n";
info << "Codec: " << MPV_PROPERTY("video-codec") << "\n";
info << "Size: " << MPV_PROPERTY("video-params/dw") << "x"
<< MPV_PROPERTY("video-params/dh") << endl;
info << "FPS (container): " << MPV_PROPERTY("container-fps") << endl;
info << "FPS (filters): " << MPV_PROPERTY("estimated-vf-fps") << endl;
info << "Aspect: " << MPV_PROPERTY("video-aspect") << endl;
info << "Bitrate: " << MPV_PROPERTY("video-bitrate") << endl;
<< MPV_PROPERTY("video-params/dh") << "\n";
info << "FPS (container): " << MPV_PROPERTY("container-fps") << "\n";
info << "FPS (filters): " << MPV_PROPERTY("estimated-vf-fps") << "\n";
info << "Aspect: " << MPV_PROPERTY("video-aspect") << "\n";
info << "Bitrate: " << MPV_PROPERTY("video-bitrate") << "\n";
double displayFps = DisplayComponent::Get().currentRefreshRate();
info << "Display FPS: " << MPV_PROPERTY("display-fps")
<< " (" << displayFps << ")" << endl;
<< " (" << displayFps << ")" << "\n";
info << "Hardware Decoding: " << MPV_PROPERTY("hwdec-current")
<< " (" << MPV_PROPERTY("hwdec-interop") << ")" << endl;
info << endl;
info << "Audio: " << endl;
info << "Codec: " << MPV_PROPERTY("audio-codec") << endl;
info << "Bitrate: " << MPV_PROPERTY("audio-bitrate") << endl;
<< " (" << MPV_PROPERTY("hwdec-interop") << ")\n";
info << "\n";
info << "Audio:\n";
info << "Codec: " << MPV_PROPERTY("audio-codec") << "\n";
info << "Bitrate: " << MPV_PROPERTY("audio-bitrate") << "\n";
info << "Channels: ";
appendAudioFormat(info, "audio-params");
info << " -> ";
appendAudioFormat(info, "audio-out-params");
info << endl;
info << "Output driver: " << MPV_PROPERTY("current-ao") << endl;
info << endl;
info << "Performance: " << endl;
info << "A/V: " << MPV_PROPERTY("avsync") << endl;
info << "Dropped frames: " << MPV_PROPERTY("vo-drop-frame-count") << endl;
info << "\n";
info << "Output driver: " << MPV_PROPERTY("current-ao") << "\n";
info << "\n";
info << "Performance:\n";
info << "A/V: " << MPV_PROPERTY("avsync") << "\n";
info << "Dropped frames: " << MPV_PROPERTY("vo-drop-frame-count") << "\n";
bool dispSync = MPV_PROPERTY_BOOL("display-sync-active");
info << "Display Sync: ";
if (!dispSync)
{
info << "no" << endl;
info << "no\n";
}
else
{
info << "yes (ratio " << MPV_PROPERTY("vsync-ratio") << ")" << endl;
info << "yes (ratio " << MPV_PROPERTY("vsync-ratio") << ")\n";
info << "Mistimed frames: " << MPV_PROPERTY("mistimed-frame-count")
<< "/" << MPV_PROPERTY("vo-delayed-frame-count") << endl;
<< "/" << MPV_PROPERTY("vo-delayed-frame-count") << "\n";
info << "Measured FPS: " << MPV_PROPERTY("estimated-display-fps")
<< " (" << MPV_PROPERTY("vsync-jitter") << ")" << endl;
info << "V. speed corr.: " << MPV_PROPERTY("video-speed-correction") << endl;
info << "A. speed corr.: " << MPV_PROPERTY("audio-speed-correction") << endl;
<< " (" << MPV_PROPERTY("vsync-jitter") << ")\n";
info << "V. speed corr.: " << MPV_PROPERTY("video-speed-correction") << "\n";
info << "A. speed corr.: " << MPV_PROPERTY("audio-speed-correction") << "\n";
}
info << endl;
info << "Cache:" << endl;
info << "Seconds: " << MPV_PROPERTY("demuxer-cache-duration") << endl;
info << "Extra readahead: " << MPV_PROPERTY("cache-used") << endl;
info << "Buffering: " << MPV_PROPERTY("cache-buffering-state") << endl;
info << "Speed: " << MPV_PROPERTY("cache-speed") << endl;
info << endl;
info << "Misc: " << endl;
info << "\n";
info << "Cache:\n";
info << "Seconds: " << MPV_PROPERTY("demuxer-cache-duration") << "\n";
info << "Extra readahead: " << MPV_PROPERTY("cache-used") << "\n";
info << "Buffering: " << MPV_PROPERTY("cache-buffering-state") << "\n";
info << "Speed: " << MPV_PROPERTY("cache-speed") << "\n";
info << "\n";
info << "Misc:\n";
info << "Time: " << MPV_PROPERTY("playback-time") << " / "
<< MPV_PROPERTY("duration")
<< " (" << MPV_PROPERTY("percent-pos") << "%)" << endl;
<< " (" << MPV_PROPERTY("percent-pos") << "%)\n";
info << "State: " << (MPV_PROPERTY_BOOL("pause") ? "paused " : "")
<< (MPV_PROPERTY_BOOL("paused-for-cache") ? "buffering " : "")
<< (MPV_PROPERTY_BOOL("core-idle") ? "waiting " : "playing ")
<< (MPV_PROPERTY_BOOL("seeking") ? "seeking " : "")
<< endl;
<< "\n";
info << flush;
info.flush();
return infoStr;
}

34
src/system/SystemComponent.cpp
View File

@ -223,29 +223,29 @@ QString SystemComponent::debugInformation()
QString debugInfo;
QTextStream stream(&debugInfo);
stream << "Jellyfin Media Player" << endl;
stream << " Version: " << Version::GetVersionString() << " built: " << Version::GetBuildDate() << endl;
stream << " Web Client Version: " << Version::GetWebVersion() << endl;
stream << " Web Client URL: " << SettingsComponent::Get().value(SETTINGS_SECTION_PATH, "startupurl").toString() << endl;
stream << " Platform: " << getPlatformTypeString() << "-" << getPlatformArchString() << endl;
stream << " User-Agent: " << getUserAgent() << endl;
stream << " Qt version: " << qVersion() << QString("(%1)").arg(Version::GetQtDepsVersion()) << endl;
stream << " Depends version: " << Version::GetDependenciesVersion() << endl;
stream << endl;
stream << "Jellyfin Media Player\n";
stream << " Version: " << Version::GetVersionString() << " built: " << Version::GetBuildDate() << "\n";
stream << " Web Client Version: " << Version::GetWebVersion() << "\n";
stream << " Web Client URL: " << SettingsComponent::Get().value(SETTINGS_SECTION_PATH, "startupurl").toString() << "\n";
stream << " Platform: " << getPlatformTypeString() << "-" << getPlatformArchString() << "\n";
stream << " User-Agent: " << getUserAgent() << "\n";
stream << " Qt version: " << qVersion() << QString("(%1)").arg(Version::GetQtDepsVersion()) << "\n";
stream << " Depends version: " << Version::GetDependenciesVersion() << "\n";
stream << "\n";
stream << "Files" << endl;
stream << " Log file: " << Paths::logDir(Names::MainName() + ".log") << endl;
stream << " Config file: " << Paths::dataDir(Names::MainName() + ".conf") << endl;
stream << endl;
stream << "Files\n";
stream << " Log file: " << Paths::logDir(Names::MainName() + ".log") << "\n";
stream << " Config file: " << Paths::dataDir(Names::MainName() + ".conf") << "\n";
stream << "\n";
stream << "Network Addresses" << endl;
stream << "Network Addresses\n";
for(const QString& addr : networkAddresses())
{
stream << " " << addr << endl;
stream << " " << addr << "\n";
}
stream << endl;
stream << "\n";
stream << flush;
stream.flush();
return debugInfo;
}