[Mplayerxp-cvslog] SF.net SVN: mplayerxp:[268] mplayerxp
Brought to you by:
olov
Menu
▾
▴
[Mplayerxp-cvslog] SF.net SVN: mplayerxp:[268] mplayerxp
|
From: <nic...@us...> - 2012-10-31 14:58:56
|
Revision: 268
http://mplayerxp.svn.sourceforge.net/mplayerxp/?rev=268&view=rev
Author: nickols_k
Date: 2012-10-31 14:58:47 +0000 (Wed, 31 Oct 2012)
Log Message:
-----------
re-enterability
Modified Paths:
--------------
mplayerxp/cfg-mplayer.h
mplayerxp/fifo.h
mplayerxp/mixer.c
mplayerxp/mixer.h
mplayerxp/mplayer.c
Modified: mplayerxp/cfg-mplayer.h
===================================================================
--- mplayerxp/cfg-mplayer.h 2012-10-31 14:29:38 UTC (rev 267)
+++ mplayerxp/cfg-mplayer.h 2012-10-31 14:58:47 UTC (rev 268)
@@ -2,6 +2,7 @@
* config for cfgparser
*/
+extern const char *oss_mixer_device;
#ifdef HAVE_SDL
//extern char *sdl_driver;
extern int sdl_noxv;
Modified: mplayerxp/fifo.h
===================================================================
--- mplayerxp/fifo.h 2012-10-31 14:29:38 UTC (rev 267)
+++ mplayerxp/fifo.h 2012-10-31 14:58:47 UTC (rev 268)
@@ -3,9 +3,6 @@
* a very simple circular buffer FIFO implementation
*/
#include "mp_config.h"
-#ifndef MSGT_CLASS
-#define MSGT_CLASS MSGT_GLOBAL
-#endif
#include "mp_msg.h"
#include <stdint.h>
Modified: mplayerxp/mixer.c
===================================================================
--- mplayerxp/mixer.c 2012-10-31 14:29:38 UTC (rev 267)
+++ mplayerxp/mixer.c 2012-10-31 14:58:47 UTC (rev 268)
@@ -1,4 +1,3 @@
-
#include <string.h>
#include <sys/ioctl.h>
#include <fcntl.h>
@@ -9,64 +8,62 @@
#include "mixer.h"
#include "libao2/audio_out.h"
-extern ao_data_t* ao_data;
-
-void mixer_getvolume( float *l,float *r )
+void mixer_getvolume(ao_data_t* ao, float *l,float *r )
{
ao_control_vol_t vol;
*l=0; *r=0;
- if(CONTROL_OK != ao_control(ao_data,AOCONTROL_GET_VOLUME,(long)&vol)) return;
+ if(CONTROL_OK != ao_control(ao,AOCONTROL_GET_VOLUME,(long)&vol)) return;
*r=vol.right;
*l=vol.left;
}
-void mixer_setvolume( float l,float r )
+void mixer_setvolume(ao_data_t* ao,float l,float r )
{
ao_control_vol_t vol;
vol.right=r; vol.left=l;
- ao_control(ao_data,AOCONTROL_SET_VOLUME,(long)&vol);
+ ao_control(ao,AOCONTROL_SET_VOLUME,(long)&vol);
}
#define MIXER_CHANGE 3
-void mixer_incvolume( void )
+void mixer_incvolume(ao_data_t* ao)
{
float mixer_l, mixer_r;
- mixer_getvolume( &mixer_l,&mixer_r );
+ mixer_getvolume(ao, &mixer_l,&mixer_r );
mixer_l += MIXER_CHANGE;
if ( mixer_l > 100 ) mixer_l = 100;
mixer_r += MIXER_CHANGE;
if ( mixer_r > 100 ) mixer_r = 100;
- mixer_setvolume( mixer_l,mixer_r );
+ mixer_setvolume(ao, mixer_l,mixer_r );
}
-void mixer_decvolume( void )
+void mixer_decvolume(ao_data_t* ao)
{
float mixer_l, mixer_r;
- mixer_getvolume( &mixer_l,&mixer_r );
+ mixer_getvolume(ao, &mixer_l,&mixer_r );
mixer_l -= MIXER_CHANGE;
if ( mixer_l < 0 ) mixer_l = 0;
mixer_r -= MIXER_CHANGE;
if ( mixer_r < 0 ) mixer_r = 0;
- mixer_setvolume( mixer_l,mixer_r );
+ mixer_setvolume(ao, mixer_l,mixer_r );
}
-float mixer_getbothvolume( void )
+float mixer_getbothvolume(ao_data_t* ao)
{
float mixer_l, mixer_r;
- mixer_getvolume( &mixer_l,&mixer_r );
+ mixer_getvolume(ao, &mixer_l,&mixer_r );
return ( mixer_l + mixer_r ) / 2;
}
static int muted=0;
static float mute_l,mute_r;
-void mixer_mute( void )
+void mixer_mute(ao_data_t* ao)
{
- if ( muted ) { mixer_setvolume( mute_l,mute_r ); muted=0; }
+ if ( muted ) { mixer_setvolume(ao, mute_l,mute_r ); muted=0; }
else
{
- mixer_getvolume( &mute_l,&mute_r );
- mixer_setvolume( 0,0 );
+ mixer_getvolume(ao, &mute_l,&mute_r );
+ mixer_setvolume(ao, 0,0 );
muted=1;
}
}
Modified: mplayerxp/mixer.h
===================================================================
--- mplayerxp/mixer.h 2012-10-31 14:29:38 UTC (rev 267)
+++ mplayerxp/mixer.h 2012-10-31 14:58:47 UTC (rev 268)
@@ -1,16 +1,15 @@
-
#ifndef __MPLAYER_MIXER
#define __MPLAYER_MIXER
+#include "libao2/audio_out.h"
-extern const char *oss_mixer_device;
-extern void mixer_getvolume( float *l,float *r );
-extern void mixer_setvolume( float l,float r );
-extern void mixer_incvolume( void );
-extern void mixer_decvolume( void );
-extern float mixer_getbothvolume( void );
-void mixer_mute( void );
+extern void mixer_getvolume(ao_data_t* ao,float *l,float *r );
+extern void mixer_setvolume(ao_data_t* ao,float l,float r );
+extern void mixer_incvolume(ao_data_t* ao);
+extern void mixer_decvolume(ao_data_t* ao);
+extern float mixer_getbothvolume(ao_data_t* ao);
+void mixer_mute(ao_data_t* ao);
//extern void mixer_setbothvolume( int v );
-static inline void mixer_setbothvolume( float v ) { mixer_setvolume( v,v ); }
+static inline void mixer_setbothvolume(ao_data_t* ao, float v ) { mixer_setvolume(ao,v,v); }
#endif
Modified: mplayerxp/mplayer.c
===================================================================
--- mplayerxp/mplayer.c 2012-10-31 14:29:38 UTC (rev 267)
+++ mplayerxp/mplayer.c 2012-10-31 14:58:47 UTC (rev 268)
@@ -33,11 +33,21 @@
#include "help_mp.h"
#include "libmpdemux/stream.h"
+#include "libmpdemux/demuxer.h"
+#include "libmpdemux/stheader.h"
+#include "libmpdemux/parse_es.h"
+
#include "libmpconf/cfgparser.h"
#include "libmpconf/codec-cfg.h"
#include "libmpconf/m_struct.h"
#include "cfg-mplayer-def.h"
+#include "libmpcodecs/dec_video.h"
+#include "libmpcodecs/dec_audio.h"
+
+/* Common FIFO functions, and keyboard/event FIFO code */
+#include "fifo.h"
+
#ifdef USE_SUB
#include "libmpsub/subreader.h"
#endif
@@ -53,7 +63,7 @@
#include "osdep/keycodes.h"
#include "osdep/timer.h"
#include "osdep/shmem.h"
-
+#include "osdep/get_path.h"
#include "osdep/cpudetect.h"
#include "osdep/mm_accel.h"
@@ -61,8 +71,9 @@
#include "dump.h"
#include "nls/nls.h"
#include "postproc/libmenu/menu.h"
+#include "mixer.h"
-#define ABS(x) (((x)>=0)?(x):(-(x)))
+#include "xmp_core.h"
#define MSGT_CLASS MSGT_CPLAYER
#include "mp_msg.h"
@@ -91,6 +102,8 @@
static x86_features_t x86;
#endif
+#define ABS(x) (((x)>=0)?(x):(-(x)))
+
#define INITED_VO 0x00000001
#define INITED_AO 0x00000002
#define INITED_GETCH2 0x00000004
@@ -136,7 +149,6 @@
/**************************************************************************
Decoding ahead
**************************************************************************/
-#include "xmp_core.h"
ao_data_t* ao_data=NULL;
vo_data_t* vo_data=NULL;
@@ -151,24 +163,10 @@
UNUSED(conf);
return m_config_parse_config_file(mp_data->mconfig, filename);
}
+#include "cfg-mplayer.h"
-#include "osdep/get_path.h"
-
-/**************************************************************************
- Input media streaming & demultiplexer:
-**************************************************************************/
-
-#include "libmpdemux/stream.h"
-#include "libmpdemux/demuxer.h"
-#include "libmpdemux/stheader.h"
-#include "libmpdemux/parse_es.h"
-
-#include "libmpcodecs/dec_video.h"
-#include "libmpcodecs/dec_audio.h"
-
-/* Common FIFO functions, and keyboard/event FIFO code */
-#include "fifo.h"
/**************************************************************************/
+extern void mp_register_options(m_config_t* cfg);
static int mpxp_init_antiviral_protection(int verbose)
{
@@ -757,11 +755,6 @@
__exit_sighandler();
}
-extern void mp_register_options(m_config_t* cfg);
-
-#include "mixer.h"
-#include "cfg-mplayer.h"
-
void parse_cfgfiles( m_config_t* conf )
{
char *conffile;
@@ -2211,19 +2204,19 @@
mp_conf.osd_level= v > 3 ? 3 : v;
} break;
case MP_CMD_MUTE:
- mixer_mute();
+ mixer_mute(ao_data);
break;
case MP_CMD_VOLUME : {
int v = cmd->args[0].v.i;
if(v > 0)
- mixer_incvolume();
+ mixer_incvolume(ao_data);
else
- mixer_decvolume();
+ mixer_decvolume(ao_data);
#ifdef USE_OSD
if(mp_conf.osd_level){
osd->visible=sh_video->fps; // 1 sec
vo_data->osd_progbar_type=OSD_VOLUME;
- vo_data->osd_progbar_value=(mixer_getbothvolume()*256.0)/100.0;
+ vo_data->osd_progbar_value=(mixer_getbothvolume(ao_data)*256.0)/100.0;
vo_osd_changed(OSDTYPE_PROGBAR);
}
#endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
