|
From: <pst...@us...> - 2008-04-06 02:18:52
|
Revision: 409
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=409&view=rev
Author: pstieber
Date: 2008-04-05 19:18:50 -0700 (Sat, 05 Apr 2008)
Log Message:
-----------
Getting ready for the metronome settings dialog.
WARNING: This will break the build for a short period of time.
Modified Paths:
--------------
trunk/jazz/src/TrackFrame.cpp
trunk/jazz/src/TrackFrame.h
Modified: trunk/jazz/src/TrackFrame.cpp
===================================================================
--- trunk/jazz/src/TrackFrame.cpp 2008-04-06 02:17:53 UTC (rev 408)
+++ trunk/jazz/src/TrackFrame.cpp 2008-04-06 02:18:50 UTC (rev 409)
@@ -35,6 +35,7 @@
#include "Globals.h"
#include "Configuration.h"
#include "Harmony.h"
+#include "Dialogs/MetronomeSettingsDialog.h"
#include "SynthesizerSettingsDialog.h"
#include "AboutDialog.h"
@@ -90,6 +91,8 @@
EVT_MENU(ID_TOOLS_HARMONY_BROWSER, JZTrackFrame::OnToolsHarmonyBrowser)
+ EVT_MENU(ID_SETTINGS_METRONOME, JZTrackFrame::OnSettingsMetronome)
+
EVT_MENU(ID_SETTINGS_SYNTH, JZTrackFrame::OnSettingsSynthesizerType)
EVT_MENU(wxID_HELP_CONTENTS, JZTrackFrame::OnHelpContents)
@@ -324,7 +327,9 @@
pSettingMenu->Append(MEN_FILTER, "&Filter...");
pSettingMenu->Append(MEN_TWSETTING, "&Window...");
pSettingMenu->Append(MEN_SONG, "&Song...");
- pSettingMenu->Append(MEN_METRONOME, "&Metronome...");
+#endif
+ pSettingMenu->Append(ID_SETTINGS_METRONOME, "&Metronome...");
+#if 0
pSettingMenu->Append(MEN_EFFECTS, "&Effects...");
pSettingMenu->Append(MEN_TIMING, "&Timing...");
pSettingMenu->Append(MEN_MIDI_THRU, "&Midi Thru...");
@@ -538,6 +543,20 @@
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
+void JZTrackFrame::OnSettingsMetronome(wxCommandEvent& Event)
+{
+ JZMetronomeInfo MetronomeInfo = gpProject->GetMetronomeInfo();
+ JZMetronomeSettingsDialog MetronomeSettingsDialog(
+ this,
+ MetronomeInfo);
+ if (
+ MetronomeSettingsDialog.ShowModal() == wxID_OK)
+ {
+ }
+}
+
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
void JZTrackFrame::OnSettingsSynthesizerType(wxCommandEvent& Event)
{
JZSynthesizerDialog SynthesizerDialog(this);
Modified: trunk/jazz/src/TrackFrame.h
===================================================================
--- trunk/jazz/src/TrackFrame.h 2008-04-06 02:17:53 UTC (rev 408)
+++ trunk/jazz/src/TrackFrame.h 2008-04-06 02:18:50 UTC (rev 409)
@@ -84,6 +84,8 @@
void OnToolsHarmonyBrowser(wxCommandEvent& Event);
+ void OnSettingsMetronome(wxCommandEvent& Event);
+
void OnSettingsSynthesizerType(wxCommandEvent& Event);
void OnHelpContents(wxCommandEvent& Event);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|