summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-09-27 20:57:00 +0000
committerarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-09-27 20:57:00 +0000
commitea2e1768d25f7c077f1ecf0a7456c05fd376f908 (patch)
treef641647905ca2c12fc2f79cd9fa8cca3c0a73358
parent21b6169342bae0abe05f3c560f75361791e3ab36 (diff)
downloadmpv-ea2e1768d25f7c077f1ecf0a7456c05fd376f908.tar.bz2
mpv-ea2e1768d25f7c077f1ecf0a7456c05fd376f908.tar.xz
when working through a mixed play tree with audi-only files and video files
the OSD level is set to 0 when playing an audio-only file. The previous OSD level never gets restored. My small patch handles this. - patch by Reder Uwe <Uwe.Reder@3SOFT.de> git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7517 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r--mplayer.c12
1 files changed, 11 insertions, 1 deletions
diff --git a/mplayer.c b/mplayer.c
index 139c5990e2..eaae9343b6 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -162,6 +162,7 @@ static int output_quality=0;
int use_gui=0;
int osd_level=1;
+int osd_level_saved=-1;
int osd_visible=100;
// seek:
@@ -1288,7 +1289,16 @@ current_module="init_vo";
main:
current_module="main";
-if(!sh_video) osd_level = 0;
+// If there is no video OSD has to be disabled.
+// In case of playing a playtree we have to restore the
+// old OSD level after playing one or more audio-only files.
+if(!sh_video && osd_level > 0) { // save OSD level only once
+ osd_level_saved = osd_level;
+ osd_level = 0;
+} else if (osd_level_saved > -1) { // if there is a saved OSD level, restore it
+ osd_level = osd_level_saved;
+ osd_level_saved = -1;
+}
fflush(stdout);