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

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

Revision: 469
          http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=469&view=rev
Author:   pstieber
Date:     2008-04-20 20:14:43 -0700 (Sun, 20 Apr 2008)

Log Message:
-----------
Updated the Linux specific modules for the latest changes.

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

Modified: trunk/jazz/src/AlsaDriver.cpp
===================================================================
--- trunk/jazz/src/AlsaDriver.cpp	2008-04-20 00:33:04 UTC (rev 468)
+++ trunk/jazz/src/AlsaDriver.cpp	2008-04-21 03:14:43 UTC (rev 469)
@@ -187,7 +187,7 @@
     return;
   }
 
-  long ticks_per_minute = Song->TicksPerQuarter * Song->Speed();
+  long ticks_per_minute = Song->GetTicksPerQuarter() * Song->Speed();
   mSamples.ResetBuffers(AudioBuffer, clock, ticks_per_minute);
   last_scount = 0;
   cur_pos = 0;
@@ -522,8 +522,8 @@
   if (pcm[PLAYBACK])
   {
     snd_pcm_drop(pcm[PLAYBACK]);
-    //long ticks_per_minute = Song->TicksPerQuarter * Song->Speed();
-    //mSamples.ResetBuffers(AudioBuffer, clock, ticks_per_minute);
+//    long ticks_per_minute = Song->GetTicksPerQuarter() * Song->Speed();
+//    mSamples.ResetBuffers(AudioBuffer, clock, ticks_per_minute);
   }
   audio_clock_offset = clock;
   cur_pos = 0;

Modified: trunk/jazz/src/AlsaPlayer.cpp
===================================================================
--- trunk/jazz/src/AlsaPlayer.cpp	2008-04-20 00:33:04 UTC (rev 468)
+++ trunk/jazz/src/AlsaPlayer.cpp	2008-04-21 03:14:43 UTC (rev 469)
@@ -322,8 +322,8 @@
         tKeyOn *k = e->IsKeyOn();
         set_event_header(&ev, e->GetClock(), SND_SEQ_EVENT_NOTEON);
         ev.data.note.channel = k->Channel;
-        ev.data.note.note = k->Key;
-        ev.data.note.velocity = k->Veloc;
+        ev.data.note.note = k->mKey;
+        ev.data.note.velocity = k->mVelocity;
         rc = write(&ev, now);
       }
       break;
@@ -592,7 +592,7 @@
 //-----------------------------------------------------------------------------
 int tAlsaPlayer::start_timer(long clock)
 {
-  int time_base = Song->TicksPerQuarter;
+  int time_base = Song->GetTicksPerQuarter();
   int cur_speed = Song->GetTrack(0)->GetCurrentSpeed(clock);
   init_queue_tempo(time_base, cur_speed);
   start_queue_timer(clock);

Modified: trunk/jazz/src/AudioDriver.cpp
===================================================================
--- trunk/jazz/src/AudioDriver.cpp	2008-04-20 00:33:04 UTC (rev 468)
+++ trunk/jazz/src/AudioDriver.cpp	2008-04-21 03:14:43 UTC (rev 469)
@@ -193,7 +193,7 @@
     return;
   }
 
-  long ticks_per_minute = Song->TicksPerQuarter * Song->Speed();
+  long ticks_per_minute = Song->GetTicksPerQuarter() * Song->Speed();
   mSamples.ResetBuffers(AudioBuffer, start_clock, ticks_per_minute);
   if (PlaybackMode())
   {

Modified: trunk/jazz/src/Player.cpp
===================================================================
--- trunk/jazz/src/Player.cpp	2008-04-20 00:33:04 UTC (rev 468)
+++ trunk/jazz/src/Player.cpp	2008-04-21 03:14:43 UTC (rev 469)
@@ -1568,16 +1568,24 @@
   {
     case StatKeyOn:
       {
-        tKeyOn *k = e->IsKeyOn();
-        SEQ_START_NOTE(mididev, k->Channel, k->Key, k->Veloc);
+        tKeyOn* pKeyOn = e->IsKeyOn();
+        SEQ_START_NOTE(
+          mididev,
+          pKeyOn->Channel,
+          pKeyOn->mKey,
+          pKeyOn->mVelocity);
         if (now) seqbuf_flush_last_event();
       }
       break;
 
     case StatKeyOff:
       {
-        tKeyOff *k = e->IsKeyOff();
-        SEQ_STOP_NOTE(mididev, k->Channel, k->Key, k->OffVeloc);
+        tKeyOff* pKeyOff = e->IsKeyOff();
+        SEQ_STOP_NOTE(
+          mididev,
+          pKeyOff->Channel,
+          pKeyOff->Key,
+          pKeyOff->OffVeloc);
         if (now) seqbuf_flush_last_event();
       }
       break;


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