New code from Marten

diff --git a/audio.cc b/audio.cc
index 0ce36dcc49b69e451c46a86652ae18e0d287206e..a601421653c8ba35e03fc8659b217b58d30221cd 100644 (file)
--- a/audio.cc
+++ b/audio.cc
@@ -27,6 +27,8 @@ Audio::Audio()
   if (instance) return;
   instance = this;
   memset(&Aoffset, 0, sizeof(Aoffset));
+  userMute = 0;
+  systemMute = 0;
 }
 
 Audio::~Audio()

diff --git a/audiomvp.cc b/audiomvp.cc
index 3ef84e1b8e7cb8c58d6aee0bebcc497118489416..d8265341b45a9524bd642774ce73f0f554cddda7 100644 (file)
--- a/audiomvp.cc
+++ b/audiomvp.cc
@@ -28,8 +28,6 @@ AudioMVP::AudioMVP()
   streamType = 0;
   volume = 20;
   muted = 0;
-  userMute = 0;
-  systemMute = 0;
 }
 
 AudioMVP::~AudioMVP()

diff --git a/audiowin.cc b/audiowin.cc
index 097247fbab1c4fff998b3ec7d1695ca26baa523f..3ab1b7805e303fbd8e2c96cfdd5db56b32056655 100644 (file)
--- a/audiowin.cc
+++ b/audiowin.cc
@@ -89,32 +89,32 @@ int AudioWin::play()
 {\r
   if (!initted) return 0;\r
   firstsynched=false;\r
+  return ((VideoWin*)Video::getInstance())->dsplay();\r
 \r
-  return 1;\r
 }\r
 \r
 int AudioWin::stop()\r
 {\r
   if (!initted) return 0;\r
-  return 1;\r
+  return ((VideoWin*)Video::getInstance())->dsstop();\r
 }\r
 \r
 int AudioWin::pause()\r
 {\r
   if (!initted) return 0;\r
-  return 1;\r
+  return ((VideoWin*)Video::getInstance())->dspause();\r
 }\r
 \r
 int AudioWin::unPause()\r
 {\r
   if (!initted) return 0;\r
-  return 1;\r
+  return ((VideoWin*)Video::getInstance())->dsunPause();\r
 }\r
 \r
 int AudioWin::reset()\r
 {\r
   if (!initted) return 0;\r
-  return 1;\r
+  return ((VideoWin*)Video::getInstance())->dsreset();\r
 }\r
 \r
 int AudioWin::setVolume(int tvolume)\r
@@ -277,3 +277,4 @@ int AudioWin::test()
 }\r
 #endif\r
 \r
+\r

diff --git a/videowin.cc b/videowin.cc
index 35ddff6fe42bcb68d17e07de1722a4fc37a64c56..e610a8448249661449775a53f5184ec0c10201bd 100644 (file)
--- a/videowin.cc
+++ b/videowin.cc
@@ -198,6 +198,12 @@ int VideoWin::sync()
 #define DO_VIDEO\r
 \r
 int VideoWin::play()\r
+{\r
+  if (!initted) return 0;\r
+  return 1;\r
+}\r
+\r
+int VideoWin::dsplay()\r
 {\r
   if (!initted) return 0;\r
 \r
@@ -303,7 +309,7 @@ int VideoWin::play()
   return 1;\r
 }\r
 \r
-int VideoWin::stop()\r
+int VideoWin::dsstop()\r
 {\r
   if (!initted) return 0;\r
 \r
@@ -313,7 +319,23 @@ int VideoWin::stop()
   return 1;\r
 }\r
 \r
+int VideoWin::stop()\r
+{\r
+  if (!initted) return 0;\r
+\r
+\r
+  return 1;\r
+}\r
+\r
 int VideoWin::reset()\r
+{\r
+  if (!initted) return 0;\r
+  \r
+\r
+  return 1;\r
+}\r
+\r
+int VideoWin::dsreset()\r
 {\r
   if (!initted) return 0;\r
   videoposx=0;\r
@@ -323,14 +345,27 @@ int VideoWin::reset()
   return 1;\r
 }\r
 \r
-int VideoWin::pause()\r
+int VideoWin::dspause()\r
 {\r
   if (!initted) return 0;\r
   if (dsmediacontrol) dsmediacontrol->Pause();\r
   return 1;\r
 }\r
 \r
+int VideoWin::pause()\r
+{\r
+  if (!initted) return 0;\r
+  \r
+  return 1;\r
+}\r
+\r
 int VideoWin::unPause() // FIXME get rid - same as play!!\r
+{//No on windows this is not the same, I don't get rid of!\r
+  if (!initted) return 0;\r
+  return 1;\r
+}\r
+\r
+int VideoWin::dsunPause() // FIXME get rid - same as play!!\r
 {//No on windows this is not the same, I don't get rid of!\r
   if (!initted) return 0;\r
   if (dsmediacontrol) dsmediacontrol->Run();\r
@@ -728,3 +763,4 @@ int VideoWin::test2()
 }\r
 #endif\r
 \r
+\r

diff --git a/videowin.h b/videowin.h
index 23f558f64d407271dbfbaf3a8968fd24d1240c3c..23da5fef930cd6006bd0480c3c4408ff0c7c5a03 100644 (file)
--- a/videowin.h
+++ b/videowin.h
@@ -58,12 +58,17 @@ class VideoWin : public Video
     int setPosition(int x, int y);\r
     int sync();\r
     int play();\r
+       int dsplay();\r
     int stop();\r
+       int dsstop();\r
     int pause();\r
+       int dspause();\r
     int unPause();\r
+       int dsunPause();\r
     int fastForward();\r
     int unFastForward();\r
     int reset();\r
+       int dsreset();\r
     int blank();\r
     int signalOn();\r
     int signalOff();\r
@@ -143,3 +148,4 @@ private:
 \r
 #endif\r
 \r
+\r