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

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

Revision: 743
          http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=743&view=rev
Author:   pstieber
Date:     2010-04-04 20:30:59 +0000 (Sun, 04 Apr 2010)

Log Message:
-----------
1. Changed ID_AUDIO_GLOBAL to ID_AUDIO_GLOBAL_SETTINGS.
2. Prepared a handler for this event.

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

Modified: trunk/jazz/src/Audio.cpp
===================================================================
--- trunk/jazz/src/Audio.cpp	2010-04-03 14:50:50 UTC (rev 742)
+++ trunk/jazz/src/Audio.cpp	2010-04-04 20:30:59 UTC (rev 743)
@@ -3,7 +3,7 @@
 //
 // Copyright (C) 1994-2000 Andreas Voss and Per Sigmond, all rights reserved.
 // Modifications Copyright (C) 2004 Patrick Earl
-// Modifications Copyright (C) 2008 Peter J. Stieber
+// Modifications Copyright (C) 2008-2010 Peter J. Stieber
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -1354,7 +1354,7 @@
         return 1;
       }
 
-    case ID_AUDIO_GLOBAL:
+    case ID_AUDIO_GLOBAL_SETTINGS:
       GlobalSettingsDlg();
       break;
 

Modified: trunk/jazz/src/Resources.h
===================================================================
--- trunk/jazz/src/Resources.h	2010-04-03 14:50:50 UTC (rev 742)
+++ trunk/jazz/src/Resources.h	2010-04-04 20:30:59 UTC (rev 743)
@@ -3,7 +3,7 @@
 //
 // Copyright (C) 1994-2000 Andreas Voss and Per Sigmond, all rights reserved.
 // Modifications Copyright (C) 2004 Patrick Earl
-// Modifications Copyright (C) 2008 Peter J. Stieber
+// Modifications Copyright (C) 2008-2010 Peter J. Stieber
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -37,7 +37,7 @@
 #define ID_SETTINGS_SYNTHESIZER              wxID_HIGHEST + 11
 #define ID_SETTINGS_MIDI_DEVICE              wxID_HIGHEST + 12
 
-#define ID_AUDIO_GLOBAL                      wxID_HIGHEST + 20
+#define ID_AUDIO_GLOBAL_SETTINGS             wxID_HIGHEST + 20
 #define ID_AUDIO_SAMPLES                     wxID_HIGHEST + 21
 #define ID_AUDIO_LOAD                        wxID_HIGHEST + 22
 #define ID_AUDIO_SAVE                        wxID_HIGHEST + 23

Modified: trunk/jazz/src/TrackFrame.cpp
===================================================================
--- trunk/jazz/src/TrackFrame.cpp	2010-04-03 14:50:50 UTC (rev 742)
+++ trunk/jazz/src/TrackFrame.cpp	2010-04-04 20:30:59 UTC (rev 743)
@@ -3,7 +3,7 @@
 //
 // Copyright (C) 1994-2000 Andreas Voss and Per Sigmond, all rights reserved.
 // Modifications Copyright (C) 2004 Patrick Earl
-// Modifications Copyright (C) 2008-2009 Peter J. Stieber
+// Modifications Copyright (C) 2008-2010 Peter J. Stieber
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -107,6 +107,8 @@
 
   EVT_MENU(ID_SETTINGS_MIDI_DEVICE, JZTrackFrame::OnSettingsMidiDevice)
 
+  EVT_MENU(ID_AUDIO_GLOBAL_SETTINGS, JZTrackFrame::OnAudioGlobalSettings)
+
   EVT_MENU(wxID_HELP_CONTENTS, JZTrackFrame::OnHelpContents)
 
   EVT_MENU(wxID_ABOUT, JZTrackFrame::OnHelpAbout)
@@ -399,7 +401,7 @@
   pMenuBar->Append(pSettingMenu, "&Settings");
 
   wxMenu* pAudioMenu = new wxMenu;
-  pAudioMenu->Append(ID_AUDIO_GLOBAL, "&Global Settings...");
+  pAudioMenu->Append(ID_AUDIO_GLOBAL_SETTINGS, "&Global Settings...");
   pAudioMenu->Append(ID_AUDIO_SAMPLES, "Sample Se&ttings... ");
   pAudioMenu->Append(ID_AUDIO_LOAD, "&Load Set...");
   pAudioMenu->Append(ID_AUDIO_SAVE, "&Save Set");
@@ -640,6 +642,13 @@
 
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
+void JZTrackFrame::OnAudioGlobalSettings(wxCommandEvent& Event)
+{
+//  mpTrackWindow->EditAudioGlobalSettings(*this);
+}
+
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
 void JZTrackFrame::OnHelpContents(wxCommandEvent& Event)
 {
   ::wxGetApp().DisplayHelpContents();

Modified: trunk/jazz/src/TrackFrame.h
===================================================================
--- trunk/jazz/src/TrackFrame.h	2010-04-03 14:50:50 UTC (rev 742)
+++ trunk/jazz/src/TrackFrame.h	2010-04-04 20:30:59 UTC (rev 743)
@@ -3,7 +3,7 @@
 //
 // Copyright (C) 1994-2000 Andreas Voss and Per Sigmond, all rights reserved.
 // Modifications Copyright (C) 2004 Patrick Earl
-// Modifications Copyright (C) 2008-2009 Peter J. Stieber
+// Modifications Copyright (C) 2008-2010 Peter J. Stieber
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -98,6 +98,8 @@
 
     void OnSettingsMidiDevice(wxCommandEvent& Event);
 
+    void OnAudioGlobalSettings(wxCommandEvent& Event);
+
     void OnHelpContents(wxCommandEvent& Event);
 
     void OnHelpAbout(wxCommandEvent& Event);


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