diff --git a/src/minimediaplayer.cpp b/src/minimediaplayer.cpp index f257a2d01fb9d487aee5922577ea530541b5a02a..2161a92c35a4c8463bc2c4429cc45425beaf1e61 100644 --- a/src/minimediaplayer.cpp +++ b/src/minimediaplayer.cpp @@ -148,7 +148,7 @@ QUrl MiniMediaPlayer::getStreamUrlFromUrl(QUrl mediaUrl) { //Run youtube-dl on Url and return Url given back. QProcess youtubedl; - youtubedl.start("youtube-dl -f bestaudio[acodec=opus]/bestaudio[acodec=vorbis]/bestaudio[acodec=mp3] -g "+mediaUrl.toString()); + youtubedl.start("youtube-dl --no-warnings -f bestaudio[acodec=opus]/bestaudio[acodec=vorbis]/bestaudio[acodec=mp3] -g "+mediaUrl.toString()); if(youtubedl.waitForFinished(-1)) { QByteArray out = youtubedl.readAllStandardOutput(); @@ -210,7 +210,7 @@ QList> MiniMediaPlayer::getStreamTitlesAndUrlsFromUrl(QUrl m QList> tracks; //Run youtube-dl on Url and return json given back. QProcess youtubedl; - youtubedl.start("youtube-dl -f bestaudio -j "+mediaUrl.toString()); + youtubedl.start("youtube-dl --no-warnings -f bestaudio -j "+mediaUrl.toString()); if(youtubedl.waitForFinished(-1)) { //If there is anything in error output, error must have occured. diff --git a/src/mprisinterface.cpp b/src/mprisinterface.cpp index 5c8de1e8b45ad9d038926c4fe96c8cd379a98c0b..91fcca625f472d2d8247771625101aa1358432ec 100644 --- a/src/mprisinterface.cpp +++ b/src/mprisinterface.cpp @@ -76,9 +76,9 @@ void MPRISPlayerInterface::dbusUpdate(QVariantMap changed) void MPRISPlayerInterface::mediaPositionChanged(qint64 position) { - emit positionChanged(Position()); + emit positionChanged(position * 1000); //milliseconds to microseconds QVariantMap map; - map.insert("Position",Position()); + map.insert("Position",position * 1000); dbusUpdate(map); } @@ -92,9 +92,9 @@ void MPRISPlayerInterface::mediaStateChanged(bool isPlaying) void MPRISPlayerInterface::mediaVolumeChanged(int volume) { - emit volumeChanged(Volume()); + emit volumeChanged(volumeFromMediaPlayer(volume)); QVariantMap map; - map.insert("Volume",Volume()); + map.insert("Volume",volumeFromMediaPlayer(volume)); dbusUpdate(map); } @@ -203,8 +203,13 @@ double MPRISPlayerInterface::Rate() double MPRISPlayerInterface::Volume() { - if(player->getVolume() == 0) return 0; - else return player->getVolume()/100; + return volumeFromMediaPlayer(player->getVolume()); +} + +double MPRISPlayerInterface::volumeFromMediaPlayer(int volume) +{ + if(volume== 0) return 0; + else return volume/100; } void MPRISPlayerInterface::setVolume(double volume) diff --git a/src/mprisinterface.h b/src/mprisinterface.h index bd9978526f55d61d4033d4e087e96cb12b97c7d4..cd353a927230306c2e8ceb792083af19eae77c84 100644 --- a/src/mprisinterface.h +++ b/src/mprisinterface.h @@ -108,6 +108,7 @@ private slots: private: MiniMediaPlayer *player; void dbusUpdate(QVariantMap changed); + double volumeFromMediaPlayer(int volume); }; #endif // MPRISINTERFACE_H