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

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

Revision: 723
          http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=723&view=rev
Author:   pstieber
Date:     2009-05-18 03:45:52 +0000 (Mon, 18 May 2009)

Log Message:
-----------
Changed rec_info to mpRecordingInfo in the Linux code.

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

Modified: trunk/jazz/src/AlsaDriver.cpp
===================================================================
--- trunk/jazz/src/AlsaDriver.cpp	2009-05-17 17:51:49 UTC (rev 722)
+++ trunk/jazz/src/AlsaDriver.cpp	2009-05-18 03:45:52 UTC (rev 723)
@@ -56,7 +56,7 @@
         mHardExit(true)
     {
       mpPlayer->mpListener = this;
-      mpPlayer->rec_info = 0;  // not recording!
+      mpPlayer->mpRecordingInfo = 0;  // not recording!
       mpPlayer->running_mode = 0;
 
       // SYNC seems not to work?? so add 8 more silent buffers
@@ -76,7 +76,7 @@
         mHardExit(true)
     {
       mpPlayer->mpListener = this;
-      mpPlayer->rec_info = 0;  // not recording!
+      mpPlayer->mpRecordingInfo = 0;  // not recording!
       mpPlayer->running_mode = 0;
 
       mpPlayer->OpenDsp(tAlsaAudioPlayer::PLAYBACK, 0);
@@ -195,7 +195,7 @@
   curr_speed  = midi_speed;
 
   running_mode = 0;
-  if (rec_info && rec_info->mpTrack->GetAudioMode())
+  if (mpRecordingInfo && mpRecordingInfo->mpTrack->GetAudioMode())
   {
     OpenDsp(CAPTURE, 1);
     recbuffers.ResetBufferSize(frag_byte_size[CAPTURE]);
@@ -623,12 +623,12 @@
   CloseDsp(true);
   if (RecordMode())
   {
-    long frc = rec_info->mFromClock;
+    long frc = mpRecordingInfo->mFromClock;
     if (frc < audio_clock_offset)
     {
       frc = audio_clock_offset;
     }
-    long toc = rec_info->mToClock;
+    long toc = mpRecordingInfo->mToClock;
     if (toc > recd_clock)
     {
       toc = recd_clock;

Modified: trunk/jazz/src/AudioDriver.cpp
===================================================================
--- trunk/jazz/src/AudioDriver.cpp	2009-05-17 17:51:49 UTC (rev 722)
+++ trunk/jazz/src/AudioDriver.cpp	2009-05-18 03:45:52 UTC (rev 723)
@@ -52,7 +52,7 @@
     {
       mpPlayer->mpListener = this;
 
-      mpPlayer->rec_info = 0;  // not recording!
+      mpPlayer->mpRecordingInfo = 0;  // not recording!
 
       // SYNC seems not to work?? so add 8 more silent buffers
       // to hear the end of the sample too.
@@ -72,7 +72,7 @@
         mHardExit(true)
     {
       mpPlayer->mpListener = this;
-      mpPlayer->rec_info = 0;  // not recording!
+      mpPlayer->mpRecordingInfo = 0;  // not recording!
 
       mCount = 8 + mpPlayer->mSamples.PrepareListen(&spl, fr_smpl, to_smpl);
       mpPlayer->OpenDsp();
@@ -184,7 +184,7 @@
 
 int tAudioPlayer::RecordMode() const
 {
-  return rec_info != 0 && rec_info->mpTrack->GetAudioMode();
+  return mpRecordingInfo != 0 && mpRecordingInfo->mpTrack->GetAudioMode();
 }
 
 void tAudioPlayer::StartAudio()
@@ -531,12 +531,12 @@
   CloseDsp(true);
   if (RecordMode())
   {
-    long frc = rec_info->mFromClock;
+    long frc = mpRecordingInfo->mFromClock;
     if (frc < start_clock)
     {
       frc = start_clock;
     }
-    long toc = rec_info->mToClock;
+    long toc = mpRecordingInfo->mToClock;
     if (toc > recd_clock)
     {
       toc = recd_clock;


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