diff options
author | jonas <jonas@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-09-19 21:42:43 +0000 |
---|---|---|
committer | jonas <jonas@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-09-19 21:42:43 +0000 |
commit | 776787600d0467cff4ec4064846c49d21677d72e (patch) | |
tree | 83c1809293184b4e66927485ae49daa423bec4d1 | |
parent | d397383c4d7678f8171f952b7b733fc1133bdce1 (diff) | |
download | mpv-776787600d0467cff4ec4064846c49d21677d72e.tar.bz2 mpv-776787600d0467cff4ec4064846c49d21677d72e.tar.xz |
Іnitial button value is -1. Only (button>0) is a correct button selection.
Initialized "dvdnav_status_t status" explicitly for clarity.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19914 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r-- | mplayer.c | 6 | ||||
-rw-r--r-- | stream/stream_dvdnav.c | 2 |
2 files changed, 4 insertions, 4 deletions
@@ -5152,7 +5152,7 @@ if(step_sec>0) { break; } break; case MP_CMD_SET_MOUSE_POS: { - int button = 0, pointer_x, pointer_y; + int button = -1, pointer_x, pointer_y; double dx, dy; pointer_x = cmd->args[0].v.i; pointer_y = cmd->args[1].v.i; @@ -5168,13 +5168,13 @@ if(step_sec>0) { } #ifdef USE_DVDNAV case MP_CMD_DVDNAV: { - int button = 0; + int button = -1; if(stream->type != STREAMTYPE_DVDNAV) break; if(mp_dvdnav_handle_input(stream, cmd->args[0].v.i, &button)) { uninit_player(INITED_ALL-(INITED_STREAM|INITED_INPUT|(fixed_vo ? INITED_VO : 0))); goto goto_enable_cache; - } else if(button) set_osd_msg(OSD_MSG_TEXT, 1, osd_duration, "Selected button number %d", button); + } else if(button>0) set_osd_msg(OSD_MSG_TEXT, 1, osd_duration, "Selected button number %d", button); break; } #endif diff --git a/stream/stream_dvdnav.c b/stream/stream_dvdnav.c index cd7a432b44..59d907253a 100644 --- a/stream/stream_dvdnav.c +++ b/stream/stream_dvdnav.c @@ -436,7 +436,7 @@ static int open_s(stream_t *stream,int mode, void* opts, int* file_format) { int mp_dvdnav_handle_input(stream_t *stream, int cmd, int *button) { dvdnav_priv_t * dvdnav_priv=(dvdnav_priv_t*)stream->priv; dvdnav_t *nav = dvdnav_priv->dvdnav; - dvdnav_status_t status; + dvdnav_status_t status=DVDNAV_STATUS_ERR; pci_t *pci = dvdnav_get_current_nav_pci(nav); int reset = 0; |