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

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

Revision: 792
          http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=792&view=rev
Author:   pstieber
Date:     2010-07-12 04:24:15 +0000 (Mon, 12 Jul 2010)

Log Message:
-----------
1. Changed the tSampleSet data member bits to mBitsPerSample.
2. Changed tSampleSet::BitsPerSample to tSampleSet::GetBitsPerSample.
3. Changed tSampleSet::clocks_per_buffer to tSampleSet::mClocksPerBuffer and added
tSampleSet::GetClocksPerBuffer
4. Removed friend status of tSample and tSampleVoice from tSampleSet.

Modified Paths:
--------------
    trunk/jazz/src/Audio.cpp
    trunk/jazz/src/Audio.h
    trunk/jazz/src/Sample.cpp

Modified: trunk/jazz/src/Audio.cpp
===================================================================
--- trunk/jazz/src/Audio.cpp	2010-07-12 01:55:11 UTC (rev 791)
+++ trunk/jazz/src/Audio.cpp	2010-07-12 04:24:15 UTC (rev 792)
@@ -90,7 +90,7 @@
         return;
 
       // not this buffer
-      if (buffer_clock + set.clocks_per_buffer <= clock)
+      if (buffer_clock + set.GetClocksPerBuffer() <= clock)
         return;
 
       // compute offset in buffer
@@ -191,7 +191,10 @@
 tSampleSet::tSampleSet(long tpm)
   : mSamplingRate(22050),
     mChannelCount(1),
-    bits(16),        // dont change!!
+
+    // Dont change!!!
+    mBitsPerSample(16),
+
     softsync(1),
     mpSampleDialog(0),
     mDefaultFileName("noname.spl"),
@@ -413,7 +416,7 @@
   ticks_per_minute  = tpm;
   event_index       = 0;
   bufshorts = BUFSHORTS;
-  clocks_per_buffer = Samples2Ticks(bufshorts);
+  mClocksPerBuffer = Samples2Ticks(bufshorts);
   num_voices        = 0;
   return 0;
 }
@@ -428,7 +431,7 @@
     return 1;
   }
   bufshorts = bufsize / 2;
-  clocks_per_buffer = Samples2Ticks(bufshorts);
+  mClocksPerBuffer = Samples2Ticks(bufshorts);
   return 0;
 }
 
@@ -454,7 +457,8 @@
   }
   else
   {
-    nfree = (int)((last_clock - start_clock) / clocks_per_buffer) - buffers_written;
+    nfree = (int)(
+      (last_clock - start_clock) / mClocksPerBuffer) - buffers_written;
   }
 
   if (nfree <= 0)
@@ -1024,8 +1028,8 @@
   wh.modus      = mChannelCount;
   wh.sc_len     = 16;
   wh.sample_fq  = mSamplingRate;
-  wh.bit_p_spl  = bits;
-  wh.byte_p_spl = mChannelCount * (bits > 8 ? 2 : 1);
+  wh.bit_p_spl  = mBitsPerSample;
+  wh.byte_p_spl = mChannelCount * (mBitsPerSample > 8 ? 2 : 1);
   wh.byte_p_sec = wh.byte_p_spl * wh.sample_fq;
 
 

Modified: trunk/jazz/src/Audio.h
===================================================================
--- trunk/jazz/src/Audio.h	2010-07-12 01:55:11 UTC (rev 791)
+++ trunk/jazz/src/Audio.h	2010-07-12 04:24:15 UTC (rev 792)
@@ -223,8 +223,6 @@
 {
   private:
 
-    friend class tSampleVoice;
-    friend class tSample;
     friend class JZWindowsAudioPlayer;
     friend class tAudioPlayer;
     friend class tAlsaAudioPlayer;
@@ -273,11 +271,16 @@
       mChannelCount = ChannelCount;
     }
 
-    int BitsPerSample() const
+    int GetBitsPerSample() const
     {
-      return bits;
+      return mBitsPerSample;
     }
 
+    double GetClocksPerBuffer() const
+    {
+      return mClocksPerBuffer;
+    }
+
     bool GetSoftSync() const
     {
       return softsync;
@@ -385,12 +388,12 @@
 
     long SampleSize(long num_samples)
     {
-      return mChannelCount * (bits == 8 ? 1L : 2L) * num_samples;
+      return mChannelCount * (mBitsPerSample == 8 ? 1L : 2L) * num_samples;
     }
 
     long BufferClock(int i) const
     {
-      return (long)(start_clock + i * clocks_per_buffer);
+      return (long)(start_clock + i * mClocksPerBuffer);
     }
 
     void SamplesDlg();
@@ -403,14 +406,16 @@
     // mono  = 1, stereo = 2
     int mChannelCount;
 
-    int bits;       // must be 16!
+    // This must be 16!
+    int mBitsPerSample;
+
     bool softsync;  // enable software midi/audio sync
 
     tSample* mSamples[eSampleCount];
     tSampleWin* mSampleWindows[eSampleCount];
 
     long   ticks_per_minute;  // MIDI sampling rate for audio/midi sync.
-    double clocks_per_buffer;
+    double mClocksPerBuffer;
     long   start_clock;       // when did play start
 
     int event_index;

Modified: trunk/jazz/src/Sample.cpp
===================================================================
--- trunk/jazz/src/Sample.cpp	2010-07-12 01:55:11 UTC (rev 791)
+++ trunk/jazz/src/Sample.cpp	2010-07-12 04:24:15 UTC (rev 792)
@@ -693,19 +693,20 @@
 int tSample::SaveWave()
 {
   WaveHeader wh;
-  wh.main_chunk  = RIFF;
-  wh.chunk_type  = WAVE;
-  wh.sub_chunk   = FMT;
-  wh.data_chunk  = DATA;
-  wh.format      = PCM_CODE;
-  wh.modus       = set.GetChannelCount();
-  wh.sc_len      = 16;
-  wh.sample_fq   = set.GetSamplingRate();
-  wh.bit_p_spl   = set.bits;
-  wh.byte_p_spl  = set.GetChannelCount() * (set.bits > 8 ? 2 : 1);
-  wh.byte_p_sec  = wh.byte_p_spl * wh.sample_fq;
+  wh.main_chunk = RIFF;
+  wh.chunk_type = WAVE;
+  wh.sub_chunk = FMT;
+  wh.data_chunk = DATA;
+  wh.format = PCM_CODE;
+  wh.modus = set.GetChannelCount();
+  wh.sc_len = 16;
+  wh.sample_fq = set.GetSamplingRate();
+  wh.bit_p_spl = set.GetBitsPerSample();
+  wh.byte_p_spl =
+    set.GetChannelCount() * (set.GetBitsPerSample() > 8 ? 2 : 1);
+  wh.byte_p_sec = wh.byte_p_spl * wh.sample_fq;
   wh.data_length = length * sizeof(short);
-  wh.length      = wh.data_length + sizeof(WaveHeader);
+  wh.length = wh.data_length + sizeof(WaveHeader);
 
 #ifdef __WXMSW__
   unlink(mFileName.c_str()); // buggy, sigh!


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