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

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

Revision: 755
          http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=755&view=rev
Author:   pstieber
Date:     2010-04-25 16:42:19 +0000 (Sun, 25 Apr 2010)

Log Message:
-----------
1. Changed GlobalSettingsDialog to EditAudioGlobalSettings in tSampleSet and JZPlayer.
2. Activated the corresponding dialog.

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

Modified: trunk/jazz/src/Audio.cpp
===================================================================
--- trunk/jazz/src/Audio.cpp	2010-04-25 05:19:15 UTC (rev 754)
+++ trunk/jazz/src/Audio.cpp	2010-04-25 16:42:19 UTC (rev 755)
@@ -803,7 +803,7 @@
 
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
-void tSampleSet::GlobalSettingsDlg()
+void tSampleSet::EditAudioGlobalSettings(wxWindow* pParent)
 {
   if (spl_dialog)
   {
@@ -813,8 +813,8 @@
 
   if (mpGlobalSettingsDialog == 0)
   {
+    mpGlobalSettingsDialog = new wxDialog(pParent, wxID_ANY, "Audio Settings");
 #ifdef OBSOLETE
-    mpGlobalSettingsDialog = new wxDialogBox(gpTrackWindow, "Audio Settings", false);
     tAudioGloblForm *form  = new tAudioGloblForm(*this);
     form->AssociatePanel(mpGlobalSettingsDialog);
     mpGlobalSettingsDialog->Fit();
@@ -1354,10 +1354,6 @@
         return 1;
       }
 
-    case ID_AUDIO_GLOBAL_SETTINGS:
-      GlobalSettingsDlg();
-      break;
-
     case ID_AUDIO_SAMPLES:
       SamplesDlg();
       return 1;

Modified: trunk/jazz/src/Audio.h
===================================================================
--- trunk/jazz/src/Audio.h	2010-04-25 05:19:15 UTC (rev 754)
+++ trunk/jazz/src/Audio.h	2010-04-25 16:42:19 UTC (rev 755)
@@ -370,7 +370,7 @@
       return *samples[i];
     }
 
-    void GlobalSettingsDlg();
+    void EditAudioGlobalSettings(wxWindow* pParent);
 
   protected:
 

Modified: trunk/jazz/src/Player.cpp
===================================================================
--- trunk/jazz/src/Player.cpp	2010-04-25 05:19:15 UTC (rev 754)
+++ trunk/jazz/src/Player.cpp	2010-04-25 16:42:19 UTC (rev 755)
@@ -685,9 +685,9 @@
 
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
-void JZPlayer::EditGlobalAudioSettings(wxWindow* pParent)
+void JZPlayer::EditAudioGlobalSettings(wxWindow* pParent)
 {
-  mSamples.GlobalSettingsDlg();
+  mSamples.EditAudioGlobalSettings(pParent);
 }
 
 #ifdef DEV_MPU401

Modified: trunk/jazz/src/Player.h
===================================================================
--- trunk/jazz/src/Player.h	2010-04-25 05:19:15 UTC (rev 754)
+++ trunk/jazz/src/Player.h	2010-04-25 16:42:19 UTC (rev 755)
@@ -281,7 +281,7 @@
       mSamples.AdjustAudioLength(t, ticks_per_minute);
     }
 
-    void EditGlobalAudioSettings(wxWindow* pParent);
+    void EditAudioGlobalSettings(wxWindow* pParent);
 
     void EditSample(int key)
     {

Modified: trunk/jazz/src/Project.cpp
===================================================================
--- trunk/jazz/src/Project.cpp	2010-04-25 05:19:15 UTC (rev 754)
+++ trunk/jazz/src/Project.cpp	2010-04-25 16:42:19 UTC (rev 755)
@@ -624,7 +624,7 @@
 //-----------------------------------------------------------------------------
 void JZProject::EditAudioGlobalSettings(wxWindow* pParent)
 {
-  mpMidiPlayer->EditGlobalAudioSettings(pParent);
+  mpMidiPlayer->EditAudioGlobalSettings(pParent);
 }
 
 //-----------------------------------------------------------------------------


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