Changeset 221 for OCO/trunk/drv16/waveplay.cpp

Timestamp:

Jul 17, 2007, 6:04:31 PM (18 years ago)

Author:

Brendan Oakley

Message:

Applied latest updates from Vlad

File:

• OCO/trunk/drv16/waveplay.cpp (modified) (9 diffs)

OCO/trunk/drv16/waveplay.cpp

@@ -40 +40 @@
 
 int waveOpened = 0;
-
+int force_closed = 0;
+extern int fAPMSuspend;
+void far apm_resume(void);
 extern "C"
 {
@@ -47 +49 @@
 }
 
+/*
+ * save already opened by mmos2
+ * to reuse in case of reopen stream needed
+ * TODO!! if there is more right way?
+ */
+ULONG ulDeviceSave, ulStreamTypeSave, ulSysFileNumSave;
 //******************************************************************************
 //******************************************************************************
@@ -55 +63 @@
     dprintf(("WAVEPLAY::Open %lx",StreamId));
 #endif
+    if (fAPMSuspend)
+    {
+#ifdef DEBUG
+        dprintf(("WAVEPLAY::Open. Suspend state"));
+#endif
+        apm_resume();
+        //return FALSE;
+    }
+
     if(StreamId == 0UL)
     {
@@ -73 +90 @@
         //if the device supports multiple active streams, then we always open
         //a new ALSA stream
-        if(devCaps[ulDevice].waveOutCaps.nrStreams == 1) {
+        //if(devCaps[ulDevice].waveOutCaps.nrStreams == 1) {
             StreamId = *pStreamId;
-        }
+        //}
+        ulDeviceSave = ulDevice;
+        ulStreamTypeSave = ulStreamType;
+        ulSysFileNumSave = ulSysFileNum;
     }
     else {
@@ -85 +105 @@
 //******************************************************************************
 //******************************************************************************
-BOOL WAVEPLAY::Close(OSSSTREAMID StreamId)
+BOOL WAVEPLAY::Close(OSSSTREAMID StreamIdl)
 {
 #ifdef DEBUG
@@ -93 +113 @@
     //if ((open_strategy & 1))
     //if (waveOpened == 1)
-    if (0)
-    {
-        if (OSS16_WaveClose(StreamId) == OSSERR_SUCCESS)
-        {
-            waveOpened--;
-            StreamId = 0UL;
-            open_strategy = 0UL;
-#ifdef DEBUG
-            dprintf(("WAVEPLAY::Closed stream: %lx, %lx, os: %lx\n", StreamId, waveOpened,open_strategy));
-#endif
-            return TRUE;
-        }
-        return FALSE;
+    if (force_closed)
+    {
+        waveOpened--;
+        StreamId = 0UL;
+        open_strategy = 0UL;
+        force_closed = 0;
+#ifdef DEBUG
+        dprintf(("WAVEPLAY::Closed stream: %lx, %lx, os: %lx\n", StreamId, waveOpened,open_strategy));
+#endif
+        return TRUE;
     }
     else
 #endif // fixme to be gone?
     {
-        if(devCaps[ulDeviceNr].waveOutCaps.nrStreams > 1)
+        //if(devCaps[ulDeviceNr].waveOutCaps.nrStreams > 1)
+        if (0)
         {
-            if (OSS16_WaveClose(StreamId) == OSSERR_SUCCESS)
+            if (OSS16_WaveClose(StreamIdl) == OSSERR_SUCCESS)
             {
                 waveOpened--;
@@ -139 +157 @@
 #endif
 
-//    if (!waveOpened) return TRUE;
+    if (fAPMSuspend)
+    {
+#ifdef DEBUG
+        dprintf(("WAVEPLAY::ConfigDev. Suspend state"));
+#endif
+        apm_resume();
+        //return FALSE;
+    }
+
+    if (StreamId == NULL)
+    {
+        WAVEPLAY::Open(ulDeviceSave, ulStreamTypeSave, ulSysFileNumSave, &StreamId);
+        if (StreamId == NULL)
+        {
+#ifdef DEBUG
+            dprintf(("WAVEPLAY::ConfigDev. Error reopening stream"));
+#endif
+            return FALSE;
+        }
+    }
 #ifdef DEBUG
     dprintf(("WAVEPLAY::ConfigDev1 SampleRate %d", pConfigInfo->ulHwSampleRate));
@@ -230 +267 @@
 //    dprintf(("WAVEPLAY::Transfer"));
 #endif
+
+    if (fAPMSuspend)
+    {
+#ifdef DEBUG
+        dprintf(("WAVEPLAY::Transfer. Suspend state"));
+#endif
+        apm_resume();
+        //return FALSE;
+    }
 
 //    if (!waveOpened) return TRUE;
@@ -283 +329 @@
 //    if (!waveOpened) return TRUE;
 
+    if (fAPMSuspend)
+    {
+#ifdef DEBUG
+        dprintf(("WAVEPLAY::AddBuffer. Suspend state"));
+#endif
+        apm_resume();
+        //return FALSE;
+    }
+
     if(pConfigInfo->fSampleRateConversion)
     {