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

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

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

Log Message:
-----------
Changed mpSampleDialog to mpSamplesDialog.

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

Modified: trunk/jazz/src/Audio.cpp
===================================================================
--- trunk/jazz/src/Audio.cpp	2010-07-17 04:19:30 UTC (rev 796)
+++ trunk/jazz/src/Audio.cpp	2010-07-17 04:35:45 UTC (rev 797)
@@ -196,7 +196,7 @@
     mBitsPerSample(16),
 
     softsync(1),
-    mpSampleDialog(0),
+    mpSamplesDialog(0),
     mDefaultFileName("noname.spl"),
     mRecordFileName("noname.wav")
 {
@@ -822,9 +822,9 @@
 //-----------------------------------------------------------------------------
 void JZSampleSet::EditAudioGlobalSettings(wxWindow* pParent)
 {
-  if (mpSampleDialog->IsShown())
+  if (mpSamplesDialog->IsShown())
   {
-    mpSampleDialog->SetFocus();
+    mpSamplesDialog->SetFocus();
     return;
   }
 
@@ -890,7 +890,7 @@
 //-----------------------------------------------------------------------------
 void JZSampleSet::ClearSampleSet(wxWindow* pParent)
 {
-  if (mpSampleDialog == 0)
+  if (mpSamplesDialog == 0)
   {
     if (wxMessageBox("Clear Sample Set?", "Confirm", wxYES_NO) == wxNO)
     {
@@ -1249,7 +1249,7 @@
   wxBeginBusyCursor();
   set.ReloadSamples();
   wxEndBusyCursor();
-  set.mpSampleDialog = 0;
+  set.mpSamplesDialog = 0;
 //  DELETE_THIS();
   Destroy();
 }
@@ -1380,19 +1380,19 @@
 //-----------------------------------------------------------------------------
 void JZSampleSet::SamplesDlg()
 {
-  if (mpSampleDialog == 0)
+  if (mpSamplesDialog == 0)
   {
-    mpSampleDialog = new JZSamplesDialog(gpTrackWindow, *this);
+    mpSamplesDialog = new JZSamplesDialog(gpTrackWindow, *this);
   }
-  mpSampleDialog->Show(true);
+  mpSamplesDialog->Show(true);
 }
 
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 void JZSampleSet::RefreshDialogs()
 {
-  if (mpSampleDialog)
+  if (mpSamplesDialog)
   {
-//    mpSampleDialog->Sample2Win(mpSampleDialog->current);
+//    mpSamplesDialog->Sample2Win(mpSamplesDialog->current);
   }
 }

Modified: trunk/jazz/src/Audio.h
===================================================================
--- trunk/jazz/src/Audio.h	2010-07-17 04:19:30 UTC (rev 796)
+++ trunk/jazz/src/Audio.h	2010-07-17 04:35:45 UTC (rev 797)
@@ -430,7 +430,7 @@
     // return the start clock for i-th free buffer
     long buffers_written;            // for computing buffers clock
 
-    JZSamplesDialog* mpSampleDialog;
+    JZSamplesDialog* mpSamplesDialog;
 
     JZEventArray* events;
 


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