787fc45fe8
- Update to version 3.4: * 0-9 keyboard shortcuts to navigate video * Left and Right arrow keyboard shortcuts to seek 10 seconds * New icons * Fixed layout bug when window is maximized on macOS * Fixed playback for some videos * Updated Polish and Japanese translations - Run spec-cleaner - Rebase minitube-no-update-check.patch, minitube-qt5-lessthan-ten.patch and minitube-fix-for-upstream-missing-qthelper.hpp-in-newer-mpv-version.patch - Add minitube-fix_audio_playback.patch OBS-URL: https://build.opensuse.org/request/show/811880 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/minitube?expand=0&rev=52
65 lines
2.2 KiB
Diff
65 lines
2.2 KiB
Diff
diff -ur minitube-3.4.orig/lib/media/src/mpv/mediampv.cpp minitube-3.4/lib/media/src/mpv/mediampv.cpp
|
|
--- minitube-3.4.orig/lib/media/src/mpv/mediampv.cpp 2020-05-30 17:30:51.000000000 +0200
|
|
+++ minitube-3.4/lib/media/src/mpv/mediampv.cpp 2020-06-02 21:40:41.349978099 +0200
|
|
@@ -133,6 +133,14 @@
|
|
}
|
|
|
|
case MPV_EVENT_FILE_LOADED:
|
|
+ // Add separate audiofile if there is any
|
|
+ if (!audioFileToAdd.isEmpty())
|
|
+ {
|
|
+ const QByteArray audioUtf8 = audioFileToAdd.toUtf8();
|
|
+ const char *args2[] = {"audio-add", audioUtf8.constData(), nullptr};
|
|
+ sendCommand(args2);
|
|
+ audioFileToAdd.clear();
|
|
+ }
|
|
setState(Media::PlayingState);
|
|
break;
|
|
|
|
@@ -257,12 +265,11 @@
|
|
const char *args[] = {"loadfile", fileUtf8.constData(), nullptr};
|
|
sendCommand(args);
|
|
|
|
- qApp->processEvents();
|
|
-
|
|
- const QByteArray audioUtf8 = audio.toUtf8();
|
|
- const char *args2[] = {"audio-add", audioUtf8.constData(), nullptr};
|
|
- sendCommand(args2);
|
|
+ // We are playing audio as separate file. The add audio command must executed when the main file is loaded
|
|
+ // Otherwise the audio file doesn't gets played
|
|
+ audioFileToAdd = audio;
|
|
|
|
+ qApp->processEvents();
|
|
clearTrackState();
|
|
}
|
|
|
|
@@ -319,6 +326,8 @@
|
|
}
|
|
|
|
void MediaMPV::play(const QString &file) {
|
|
+ audioFileToAdd.clear();
|
|
+
|
|
const QByteArray fileUtf8 = file.toUtf8();
|
|
const char *args[] = {"loadfile", fileUtf8.constData(), nullptr};
|
|
sendCommand(args);
|
|
@@ -365,6 +374,7 @@
|
|
}
|
|
|
|
void MediaMPV::enqueue(const QString &file) {
|
|
+ audioFileToAdd.clear();
|
|
const QByteArray fileUtf8 = file.toUtf8();
|
|
const char *args[] = {"loadfile", fileUtf8.constData(), "append", nullptr};
|
|
sendCommand(args);
|
|
diff -ur minitube-3.4.orig/lib/media/src/mpv/mediampv.h minitube-3.4/lib/media/src/mpv/mediampv.h
|
|
--- minitube-3.4.orig/lib/media/src/mpv/mediampv.h 2020-05-30 17:30:51.000000000 +0200
|
|
+++ minitube-3.4/lib/media/src/mpv/mediampv.h 2020-06-02 21:29:32.201010301 +0200
|
|
@@ -59,6 +59,8 @@
|
|
Media::State currentState = Media::StoppedState;
|
|
bool aboutToFinishEmitted = false;
|
|
QString lastErrorString;
|
|
+
|
|
+ QString audioFileToAdd;
|
|
};
|
|
|
|
#endif // MEDIAMPV_H
|