diff options
author | albeu <albeu@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-11-20 23:44:46 +0000 |
---|---|---|
committer | albeu <albeu@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-11-20 23:44:46 +0000 |
commit | 364ebd2a6fa21abb3a4de7d2419f11b30c21fc40 (patch) | |
tree | ae4a9fb424ab5cc0009bf47b7996bf8389142bdd /mplayer.c | |
parent | 56770b6eef22c1b051c0f8441e5fe8f54b05e45a (diff) | |
download | mpv-364ebd2a6fa21abb3a4de7d2419f11b30c21fc40.tar.bz2 mpv-364ebd2a6fa21abb3a4de7d2419f11b30c21fc40.tar.xz |
Make the osd command only switch between enabled/disabled when
using the term osd.
Also put a define to test for the term osd without #ifdef.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17022 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mplayer.c')
-rw-r--r-- | mplayer.c | 21 |
1 files changed, 14 insertions, 7 deletions
@@ -225,6 +225,7 @@ int enqueue=0; #endif #define MAX_OSD_LEVEL 3 +#define MAX_TERM_OSD_LEVEL 1 int osd_level=1; int osd_level_saved=-1; @@ -1150,6 +1151,14 @@ static mp_osd_msg_t* get_osd_msg(void) { return NULL; } +// Make a define to test if we are using the term osd without having +// to #ifdef USE_OSD all the time. +#ifdef USE_OSD +#define use_term_osd (term_osd && !sh_video) +#else +#define use_term_osd (term_osd) +#endif + /** * \brief Display the OSD bar. * @@ -2966,11 +2975,7 @@ if(auto_quality>0){ // small hack to display the pause message in the osd line // The pause string is: "\n == PAUSE == \r" so we need to // take the first and the last char out -#ifdef USE_OSD - if(term_osd && !sh_video) { -#else - if(term_osd) { -#endif + if(use_term_osd) { char msg[128] = MSGTR_Paused; int mlen = strlen(msg); msg[mlen-1] = '\0'; @@ -3232,10 +3237,12 @@ if (stream->type==STREAMTYPE_DVDNAV && dvd_nav_still) } break; case MP_CMD_OSD : { int v = cmd->args[0].v.i; + int max = use_term_osd ? MAX_TERM_OSD_LEVEL : MAX_OSD_LEVEL; + if(osd_level > max) osd_level = max; if(v < 0) - osd_level=(osd_level+1)%(MAX_OSD_LEVEL+1); + osd_level=(osd_level+1)%(max+1); else - osd_level= v > MAX_OSD_LEVEL ? MAX_OSD_LEVEL : v; + osd_level= v > max ? max : v; /* Show OSD state when disabled, but not when an explicit argument is given to the osd command, i.e. in slave mode. */ if (v == -1 && osd_level <= 1) |