[Mplayerxp-cvslog] SF.net SVN: mplayerxp:[335] mplayerxp

[<nic...@us...>]

Revision: 335
          http://mplayerxp.svn.sourceforge.net/mplayerxp/?rev=335&view=rev
Author:   nickols_k
Date:     2012-11-12 09:23:05 +0000 (Mon, 12 Nov 2012)
Log Message:
-----------
move mixer into libao2

Modified Paths:
--------------
    mplayerxp/Makefile
    mplayerxp/libao2/Makefile
    mplayerxp/mplayerxp.c

Added Paths:
-----------
    mplayerxp/libao2/mixer.c
    mplayerxp/libao2/mixer.h

Removed Paths:
-------------
    mplayerxp/mixer.c
    mplayerxp/mixer.h

Modified: mplayerxp/Makefile
===================================================================
--- mplayerxp/Makefile	2012-11-12 09:03:29 UTC (rev 334)
+++ mplayerxp/Makefile	2012-11-12 09:23:05 UTC (rev 335)
@@ -24,7 +24,7 @@
 LDFLAGS += -Wl,-rpath,${CODECDIR}/codecs
 
 SRCS_COMMON = mp_msg.c
-SRCS_MPLAYER = mplayerxp.c fifo.c $(SRCS_COMMON) mixer.c mp-opt-reg.c dump.c
+SRCS_MPLAYER = mplayerxp.c fifo.c $(SRCS_COMMON) mp-opt-reg.c dump.c
 
 OBJS_MPLAYER = $(SRCS_MPLAYER:.c=.o)
 

Modified: mplayerxp/libao2/Makefile
===================================================================
--- mplayerxp/libao2/Makefile	2012-11-12 09:03:29 UTC (rev 334)
+++ mplayerxp/libao2/Makefile	2012-11-12 09:23:05 UTC (rev 335)
@@ -4,7 +4,7 @@
 LIBNAME = libao2.a
 
 # TODO: moveout ao_sdl.c so it's only used when SDL is detected
-SRCS= audio_out.c afmt.c ao_null.c ao_wav.c
+SRCS= audio_out.c afmt.c ao_null.c ao_wav.c mixer.c
 ifeq ($(HAVE_SDL),yes)
 SRCS+=ao_sdl.c
 endif

Copied: mplayerxp/libao2/mixer.c (from rev 333, mplayerxp/mixer.c)
===================================================================
--- mplayerxp/libao2/mixer.c	                        (rev 0)
+++ mplayerxp/libao2/mixer.c	2012-11-12 09:23:05 UTC (rev 335)
@@ -0,0 +1,69 @@
+#include <string.h>
+#include <sys/ioctl.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <unistd.h>
+
+#include "mp_config.h"
+#include "mixer.h"
+#include "libao2/audio_out.h"
+
+void mixer_getvolume(ao_data_t* ao, float *l,float *r )
+{
+  ao_control_vol_t vol;
+  *l=0; *r=0;
+  if(MPXP_Ok != ao_control(ao,AOCONTROL_GET_VOLUME,(long)&vol)) return;
+  *r=vol.right;
+  *l=vol.left;
+}
+
+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,AOCONTROL_SET_VOLUME,(long)&vol);
+}
+
+#define MIXER_CHANGE 3
+
+void mixer_incvolume(ao_data_t* ao)
+{
+ float 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(ao, mixer_l,mixer_r );
+}
+
+void mixer_decvolume(ao_data_t* ao)
+{
+ float 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(ao, mixer_l,mixer_r );
+}
+
+float mixer_getbothvolume(ao_data_t* ao)
+{
+ float 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(ao_data_t* ao)
+{
+ if ( muted ) { mixer_setvolume(ao, mute_l,mute_r ); muted=0; }
+  else
+   {
+    mixer_getvolume(ao, &mute_l,&mute_r );
+    mixer_setvolume(ao, 0,0 );
+    muted=1;
+   }
+}

Copied: mplayerxp/libao2/mixer.h (from rev 333, mplayerxp/mixer.h)
===================================================================
--- mplayerxp/libao2/mixer.h	                        (rev 0)
+++ mplayerxp/libao2/mixer.h	2012-11-12 09:23:05 UTC (rev 335)
@@ -0,0 +1,15 @@
+#ifndef __MPLAYER_MIXER
+#define __MPLAYER_MIXER
+#include "libao2/audio_out.h"
+
+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(ao_data_t* ao, float v ) { mixer_setvolume(ao,v,v); }
+
+#endif

Deleted: mplayerxp/mixer.c
===================================================================
--- mplayerxp/mixer.c	2012-11-12 09:03:29 UTC (rev 334)
+++ mplayerxp/mixer.c	2012-11-12 09:23:05 UTC (rev 335)
@@ -1,69 +0,0 @@
-#include <string.h>
-#include <sys/ioctl.h>
-#include <fcntl.h>
-#include <stdio.h>
-#include <unistd.h>
-
-#include "mp_config.h"
-#include "mixer.h"
-#include "libao2/audio_out.h"
-
-void mixer_getvolume(ao_data_t* ao, float *l,float *r )
-{
-  ao_control_vol_t vol;
-  *l=0; *r=0;
-  if(MPXP_Ok != ao_control(ao,AOCONTROL_GET_VOLUME,(long)&vol)) return;
-  *r=vol.right;
-  *l=vol.left;
-}
-
-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,AOCONTROL_SET_VOLUME,(long)&vol);
-}
-
-#define MIXER_CHANGE 3
-
-void mixer_incvolume(ao_data_t* ao)
-{
- float 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(ao, mixer_l,mixer_r );
-}
-
-void mixer_decvolume(ao_data_t* ao)
-{
- float 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(ao, mixer_l,mixer_r );
-}
-
-float mixer_getbothvolume(ao_data_t* ao)
-{
- float 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(ao_data_t* ao)
-{
- if ( muted ) { mixer_setvolume(ao, mute_l,mute_r ); muted=0; }
-  else
-   {
-    mixer_getvolume(ao, &mute_l,&mute_r );
-    mixer_setvolume(ao, 0,0 );
-    muted=1;
-   }
-}

Deleted: mplayerxp/mixer.h
===================================================================
--- mplayerxp/mixer.h	2012-11-12 09:03:29 UTC (rev 334)
+++ mplayerxp/mixer.h	2012-11-12 09:23:05 UTC (rev 335)
@@ -1,15 +0,0 @@
-#ifndef __MPLAYER_MIXER
-#define __MPLAYER_MIXER
-#include "libao2/audio_out.h"
-
-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(ao_data_t* ao, float v ) { mixer_setvolume(ao,v,v); }
-
-#endif

Modified: mplayerxp/mplayerxp.c
===================================================================
--- mplayerxp/mplayerxp.c	2012-11-12 09:03:29 UTC (rev 334)
+++ mplayerxp/mplayerxp.c	2012-11-12 09:23:05 UTC (rev 335)
@@ -44,9 +44,6 @@
 #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
@@ -71,7 +68,7 @@
 #include "dump.h"
 #include "nls/nls.h"
 #include "postproc/libmenu/menu.h"
-#include "mixer.h"
+#include "libao2/mixer.h"
 
 #include "xmpcore/xmp_core.h"
 #include "xmpcore/xmp_vplayer.h"

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.