diff options
| author | Mateusz Łukasik <mati75@linuxmint.pl> | 2015-07-07 19:59:33 +0200 |
|---|---|---|
| committer | Mateusz Łukasik <mati75@linuxmint.pl> | 2015-07-07 19:59:33 +0200 |
| commit | ac1e595cfef357d7ef481dbbefb88996af72eb79 (patch) | |
| tree | c6a8a171488f1296d0b816c7cf6ae45f874cb453 /src/mpvoptions.cpp | |
| parent | 6027a8ff2d6ae4eba912427c30c58208009c1ebc (diff) | |
Imported Upstream version 14.9.0.6994~ds0
Diffstat (limited to 'src/mpvoptions.cpp')
| -rw-r--r-- | src/mpvoptions.cpp | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/src/mpvoptions.cpp b/src/mpvoptions.cpp index 909bfa6..e6da398 100644 --- a/src/mpvoptions.cpp +++ b/src/mpvoptions.cpp @@ -29,17 +29,21 @@ void MPVProcess::setMedia(const QString & media, bool is_playlist) { "INFO_VIDEO_ASPECT=${=video-aspect}\n" // "INFO_VIDEO_DSIZE=${=dwidth}x${=dheight}\n" "INFO_VIDEO_FPS=${=fps}\n" - "INFO_VIDEO_BITRATE=${=video-bitrate}\n" +// "INFO_VIDEO_BITRATE=${=video-bitrate}\n" "INFO_VIDEO_FORMAT=${=video-format}\n" "INFO_VIDEO_CODEC=${=video-codec}\n" - "INFO_AUDIO_BITRATE=${=audio-bitrate}\n" - "INFO_AUDIO_FORMAT=${=audio-format}\n" +// "INFO_AUDIO_BITRATE=${=audio-bitrate}\n" +// "INFO_AUDIO_FORMAT=${=audio-format}\n" + "INFO_AUDIO_FORMAT=${=audio-codec-name:${=audio-format}}\n" "INFO_AUDIO_CODEC=${=audio-codec}\n" - "INFO_AUDIO_RATE=${=audio-samplerate}\n" - "INFO_AUDIO_NCH=${=audio-channels}\n" +// "INFO_AUDIO_RATE=${=audio-samplerate}\n" + "INFO_AUDIO_RATE=${=audio-params/samplerate:${=audio-samplerate}}\n" +// "INFO_AUDIO_NCH=${=audio-channels}\n" + "INFO_AUDIO_NCH=${=audio-params/channel-count:${=audio-channels}}\n" - "INFO_LENGTH=${=length}\n" +// "INFO_LENGTH=${=length}\n" + "INFO_LENGTH=${=duration:${=length}}\n" "INFO_DEMUXER=${=demuxer}\n" "INFO_TITLES=${=disc-titles}\n" @@ -57,7 +61,7 @@ void MPVProcess::setMedia(const QString & media, bool is_playlist) { "INFO_MEDIA_TITLE=${=media-title:}\n"; #ifdef CUSTOM_STATUS - arg << "--term-status-msg=STATUS: ${=time-pos} / ${=length:0} P: ${=pause} B: ${=paused-for-cache} I: ${=core-idle}"; + arg << "--term-status-msg=STATUS: ${=time-pos} / ${=duration:${=length:0}} P: ${=pause} B: ${=paused-for-cache} I: ${=core-idle}"; #endif if (is_playlist) { @@ -72,7 +76,7 @@ void MPVProcess::setFixedOptions() { arg << "--no-quiet"; arg << "--terminal"; arg << "--no-msg-color"; - arg << "--slave-broken"; + arg << "--input-file=/dev/stdin"; //arg << "--no-osc"; //arg << "--msg-level=vd=v"; } @@ -827,3 +831,7 @@ void MPVProcess::setSubStyles(const AssStyles & styles, const QString &) { } } } + +void MPVProcess::setChannelsFile(const QString & filename) { + arg << "--dvbin-file=" + filename; +} |