summaryrefslogtreecommitdiffstats
path: root/libvo/osx_common.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2012-08-07 01:13:25 +0200
committerwm4 <wm4@nowhere>2012-08-07 01:13:25 +0200
commitf3bb6692c728bd05f567fe1ca53902ec41bec235 (patch)
tree4e24574d2bb54036d4e142b375c0b71e5e3a3b3f /libvo/osx_common.c
parent1602bb5a4616b35cddbefc950eec404cc5110dc4 (diff)
downloadmpv-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.
Diffstat (limited to 'libvo/osx_common.c')
-rw-r--r--libvo/osx_common.c5
1 files changed, 2 insertions, 3 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));
}
/**