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

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

Revision: 561
          http://mplayerxp.svn.sourceforge.net/mplayerxp/?rev=561&view=rev
Author:   nickols_k
Date:     2012-12-14 15:13:41 +0000 (Fri, 14 Dec 2012)
Log Message:
-----------
fixes

Modified Paths:
--------------
    mplayerxp/libao2/ao_sdl.cpp
    mplayerxp/libvo2/vo_sdl.cpp
    mplayerxp/xmpcore/xmp_context.cpp

Modified: mplayerxp/libao2/ao_sdl.cpp
===================================================================
--- mplayerxp/libao2/ao_sdl.cpp	2012-12-14 14:52:33 UTC (rev 560)
+++ mplayerxp/libao2/ao_sdl.cpp	2012-12-14 15:13:41 UTC (rev 561)
@@ -67,18 +67,19 @@
 	unsigned	buf_write;
 	unsigned	buf_read_pos;
 	unsigned	buf_write_pos;
-	unsigned	volume;
+	unsigned*	volume;
 	int		full_buffers;
 	int		buffered_bytes;
 };
 
 SDL_AO_Interface::SDL_AO_Interface(const std::string& _subdevice)
-		:AO_Interface(_subdevice) {}
+		:AO_Interface(_subdevice),volume(new unsigned) {}
 
 SDL_AO_Interface::~SDL_AO_Interface() {
     MSG_V("SDL: Audio Subsystem shutting down!\n");
     SDL_CloseAudio();
     SDL_QuitSubSystem(SDL_INIT_AUDIO);
+    delete volume;
 }
 
 int SDL_AO_Interface::write_buffer(const uint8_t* data,int len){
@@ -107,7 +108,7 @@
 	if(full_buffers==0) break; // no more data buffered!
 	x=std::min(unsigned(len),BUFFSIZE-buf_read_pos);
 	memcpy(data+len2,buffer[buf_read]+buf_read_pos,x);
-	SDL_MixAudio(data+len2, data+len2, x, volume);
+	SDL_MixAudio(data+len2, data+len2, x, *volume);
 	len2+=x; len-=x;
 	buffered_bytes-=x; buf_read_pos+=x;
 	if(buf_read_pos>=BUFFSIZE){
@@ -143,15 +144,15 @@
     switch (cmd) {
 	case AOCONTROL_GET_VOLUME: {
 	    ao_control_vol_t* vol = (ao_control_vol_t*)arg;
-	    vol->left = vol->right = (float)((volume + 127)/2.55);
+	    vol->left = vol->right = (float)((*volume + 127)/2.55);
 	    return MPXP_Ok;
 	}
 	case AOCONTROL_SET_VOLUME: {
 	    float diff;
 	    ao_control_vol_t* vol = (ao_control_vol_t*)arg;
 	    diff = (vol->left+vol->right) / 2;
-//	    volume = (int)(diff * 2.55) - 127;
-//	    return MPXP_Ok;
+	    *volume = (int)(diff * 2.55) - 127;
+	    return MPXP_Ok;
 	    return MPXP_False;
 	}
     }
@@ -170,7 +171,7 @@
 {
     unsigned i;
     UNUSED(flags);
-    volume=127;
+    *volume=127;
     /* Allocate ring-priv->buffer memory */
     for(i=0;i<NUM_BUFS;i++) buffer[i]=new uint8_t[BUFFSIZE];
 

Modified: mplayerxp/libvo2/vo_sdl.cpp
===================================================================
--- mplayerxp/libvo2/vo_sdl.cpp	2012-12-14 14:52:33 UTC (rev 560)
+++ mplayerxp/libvo2/vo_sdl.cpp	2012-12-14 15:13:41 UTC (rev 561)
@@ -135,13 +135,12 @@
 #endif
 #include "vo_msg.h"
 
-int sdl_noxv;
-int sdl_forcexv;
-int sdl_forcegl;
-
 #include <SDL/SDL.h>
 
 namespace mpxp {
+int sdl_noxv;
+int sdl_forcexv;
+int sdl_forcegl;
 #if	defined(sun) && defined(__svr4__)
 /* setenv is missing on solaris */
 static void setenv(const char *name, const char *val, int _xx)

Modified: mplayerxp/xmpcore/xmp_context.cpp
===================================================================
--- mplayerxp/xmpcore/xmp_context.cpp	2012-12-14 14:52:33 UTC (rev 560)
+++ mplayerxp/xmpcore/xmp_context.cpp	2012-12-14 15:13:41 UTC (rev 561)
@@ -10,6 +10,7 @@
 #include "libmpsub/spudec.h"
 #include "libmpstream2/network.h"
 
+namespace mpxp {
 #ifdef HAVE_SDL
 //extern char *sdl_driver;
 extern int sdl_noxv;
@@ -17,8 +18,6 @@
 extern int sdl_forcegl;
 //extern char *sdl_adriver;
 #endif
-
-namespace mpxp {
 extern const char *oss_mixer_device;
 
 static const config_t xpcore_config[]={

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