SF.net SVN: jazzplusplus:[803] trunk/jazz/src

[<pst...@us...>]

Revision: 803
          http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=803&view=rev
Author:   pstieber
Date:     2010-07-17 17:16:29 +0000 (Sat, 17 Jul 2010)

Log Message:
-----------
Updated Linux audio to match the latest changes.

Modified Paths:
--------------
    trunk/jazz/src/AlsaDriver.cpp
    trunk/jazz/src/AudioDriver.cpp

Modified: trunk/jazz/src/AlsaDriver.cpp
===================================================================
--- trunk/jazz/src/AlsaDriver.cpp	2010-07-17 16:52:53 UTC (rev 802)
+++ trunk/jazz/src/AlsaDriver.cpp	2010-07-17 17:16:29 UTC (rev 803)
@@ -424,7 +424,7 @@
       ReadSamples();
     }
 
-    if (pcm[PLAYBACK] && mSamples.softsync)
+    if (pcm[PLAYBACK] && mSamples.GetSoftSync())
     {
       MidiSync();
     }
@@ -460,7 +460,7 @@
 
   for (; room > frag_size[PLAYBACK]; room -= frag_size[PLAYBACK])
   {
-    JZAudioBuffer* buf = mSamples.GetFullBuffers().Get();
+    JZAudioBuffer* buf = mSamples.mFullBuffers.Get();
     if (buf == 0)
     {
       break;
@@ -488,7 +488,7 @@
       cur_scount += written;
     }
     blocks_written++;
-    mSamples.free_buffers.Put(buf);
+    mSamples.mFreeBuffers.Put(buf);
   }
 
   return blocks_written;

Modified: trunk/jazz/src/AudioDriver.cpp
===================================================================
--- trunk/jazz/src/AudioDriver.cpp	2010-07-17 16:52:53 UTC (rev 802)
+++ trunk/jazz/src/AudioDriver.cpp	2010-07-17 17:16:29 UTC (rev 803)
@@ -369,7 +369,7 @@
       ReadSamples();
     }
 
-    if (mSamples.softsync)
+    if (mSamples.GetSoftSync())
     {
       MidiSync();
     }
@@ -401,7 +401,7 @@
 
   for (int i = 0; i < info.fragments - 1; i++)
   {
-    JZAudioBuffer* buf = mSamples.full_buffers.Get();
+    JZAudioBuffer* buf = mSamples.mFullBuffers.Get();
     if (buf == 0)
     {
       break;
@@ -411,7 +411,7 @@
       perror("write");
     }
     blocks_written ++;
-    mSamples.free_buffers.Put(buf);
+    mSamples.mFreeBuffers.Put(buf);
   }
 
   return blocks_written;


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