From 11b55ec7a89c8605401e40b6a4c56ca8971350da Mon Sep 17 00:00:00 2001 From: diego Date: Sun, 14 Feb 2010 10:53:20 +0000 Subject: Fix exit_player() usage throughout the codebase. exit_player() was declared with differing parameter types in mplayer.c and mplayer.h. Make the declaration in the .h file match the one in the .c file and adjust all usages of exit_player() throughout the codebase. Also move the exit_player() declaration into mp_core.h next to exit_player_with_rc(). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30558 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libao2/audio_out.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libao2') diff --git a/libao2/audio_out.c b/libao2/audio_out.c index 09f498fa4e..fc47c82ea7 100644 --- a/libao2/audio_out.c +++ b/libao2/audio_out.c @@ -25,7 +25,7 @@ #include "mp_msg.h" #include "help_mp.h" -#include "mplayer.h" /* for exit_player() */ +#include "mp_core.h" /* for exit_player() */ // there are some globals: ao_data_t ao_data={0,0,0,0,OUTBURST,-1,0}; @@ -147,7 +147,7 @@ const ao_functions_t* init_best_audio_out(char** ao_list,int use_plugin,int rate int ao_len; if (strncmp(ao, "alsa9", 5) == 0 || strncmp(ao, "alsa1x", 6) == 0) { mp_msg(MSGT_AO, MSGL_FATAL, MSGTR_AO_ALSA9_1x_Removed); - exit_player(NULL); + exit_player(EXIT_NONE); } if (ao_subdevice) { free(ao_subdevice); -- cgit v1.2.3