diff options
| author | wm4 <wm4@nowhere> | 2012-08-07 01:13:25 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2012-08-07 01:13:25 +0200 |
| commit | f3bb6692c728bd05f567fe1ca53902ec41bec235 (patch) | |
| tree | 4e24574d2bb54036d4e142b375c0b71e5e3a3b3f | |
| parent | 1602bb5a4616b35cddbefc950eec404cc5110dc4 (diff) | |
| download | mpv-f3bb6692c728bd05f567fe1ca53902ec41bec235.tar.bz2 mpv-f3bb6692c728bd05f567fe1ca53902ec41bec235.tar.xz | |
osx_common: remove old VO include, modify change_movie_aspect()
The only reason the old VO related header old_vo_defines.h was included
was probably to gain access to the current VO struct in the function
change_movie_aspect(). Make that function take a parameter instead.
This function seems to be unused.
| -rw-r--r-- | libvo/osx_common.c | 5 | ||||
| -rw-r--r-- | libvo/osx_common.h | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/libvo/osx_common.c b/libvo/osx_common.c index 52b8d89aaa..155b8d02b3 100644 --- a/libvo/osx_common.c +++ b/libvo/osx_common.c @@ -21,7 +21,6 @@ #include <Carbon/Carbon.h> #include "config.h" #include "osx_common.h" -#include "old_vo_defines.h" #include "video_out.h" #include "input/keycodes.h" #include "input/input.h" @@ -122,14 +121,14 @@ static float old_movie_aspect; * Sends MPlayer a command to change aspect to the requested value. * @param new_aspect desired new aspect, < 0 means restore original. */ -void change_movie_aspect(float new_aspect) +void change_movie_aspect(struct vo *vo, float new_aspect) { char cmd_str[64]; if (new_aspect < 0) new_aspect = old_movie_aspect; our_aspect_change = 1; snprintf(cmd_str, sizeof(cmd_str), "switch_ratio %f", new_aspect); - mp_input_queue_cmd(global_vo->input_ctx, mp_input_parse_cmd(cmd_str)); + mp_input_queue_cmd(vo->input_ctx, mp_input_parse_cmd(cmd_str)); } /** diff --git a/libvo/osx_common.h b/libvo/osx_common.h index 21bb3d8548..43d9d07c99 100644 --- a/libvo/osx_common.h +++ b/libvo/osx_common.h @@ -19,8 +19,10 @@ #ifndef MPLAYER_OSX_COMMON_H #define MPLAYER_OSX_COMMON_H +struct vo; + int convert_key(unsigned key, unsigned charcode); -void change_movie_aspect(float new_aspect); +void change_movie_aspect(struct vo *vo, float new_aspect); void config_movie_aspect(float config_aspect); void osx_foreground_hack(void); |