Menu
▾
▴
SF.net SVN: jazzplusplus:[780] trunk/jazz/src
|
From: <pst...@us...> - 2010-05-10 03:10:02
|
Revision: 780
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=780&view=rev
Author: pstieber
Date: 2010-05-10 03:09:56 +0000 (Mon, 10 May 2010)
Log Message:
-----------
Updated some menu IDs.
Modified Paths:
--------------
trunk/jazz/src/GuitarFrame.cpp
trunk/jazz/src/Harmony.cpp
trunk/jazz/src/Resources.h
trunk/jazz/src/Rhythm.cpp
trunk/jazz/src/SampleWindow.cpp
Modified: trunk/jazz/src/GuitarFrame.cpp
===================================================================
--- trunk/jazz/src/GuitarFrame.cpp 2010-05-10 00:30:40 UTC (rev 779)
+++ trunk/jazz/src/GuitarFrame.cpp 2010-05-10 03:09:56 UTC (rev 780)
@@ -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
@@ -44,7 +44,7 @@
EVT_MENU(MEN_CLEAR, JZGuitarFrame::OnClear)
- EVT_MENU(MEN_SETTINGS, JZGuitarFrame::OnSettings)
+ EVT_MENU(ID_VIEW_SETTINGS, JZGuitarFrame::OnSettings)
EVT_MENU(wxID_HELP, JZGuitarFrame::OnHelp)
@@ -68,15 +68,22 @@
// set the frame icon
// SetIcon(wxICON(mondrian));
- wxMenu* pMenu = new wxMenu;
- pMenu->Append(MEN_CLEAR, "C&lear");
- pMenu->Append(MEN_SETTINGS, "&Settings");
- pMenu->Append(wxID_HELP, "&Help");
- pMenu->Append(wxID_CLOSE, "&Close");
-
+ wxMenu* pMenu = 0;
wxMenuBar* pMenuBar = new wxMenuBar;
- pMenuBar->Append(pMenu, "&Menu");
+ pMenu = new wxMenu;
+ pMenu->Append(wxID_CLOSE, "&Close");
+ pMenuBar->Append(pMenu, "&File");
+
+ pMenu = new wxMenu;
+ pMenu->Append(MEN_CLEAR, "C&lear");
+ pMenu->Append(ID_VIEW_SETTINGS, "&Settings");
+ pMenuBar->Append(pMenu, "&View");
+
+ pMenu = new wxMenu;
+ pMenu->Append(wxID_HELP, "&Help");
+ pMenuBar->Append(pMenu, "&Help");
+
SetMenuBar(pMenuBar);
mpFretBoardWindow = new JZGuitarWindow(this, wxPoint(0, 0), wxSize(600, 120));
Modified: trunk/jazz/src/Harmony.cpp
===================================================================
--- trunk/jazz/src/Harmony.cpp 2010-05-10 00:30:40 UTC (rev 779)
+++ trunk/jazz/src/Harmony.cpp 2010-05-10 03:09:56 UTC (rev 780)
@@ -22,22 +22,23 @@
#include "Harmony.h"
+#include "FileSelector.h"
+#include "Filter.h"
+#include "Globals.h"
+#include "GuitarFrame.h"
+#include "HarmonyBrowserAnalyzer.h"
#include "HarmonyP.h"
-#include "ProjectManager.h"
-#include "Player.h"
-#include "TrackFrame.h"
-#include "TrackWindow.h"
+#include "Help.h"
#include "PianoFrame.h"
#include "PianoWindow.h"
-#include "GuitarFrame.h"
+#include "Player.h"
+#include "ProjectManager.h"
+#include "Rectangle.h"
+#include "Resources.h"
#include "Song.h"
-#include "Filter.h"
#include "ToolBar.h"
-#include "HarmonyBrowserAnalyzer.h"
-#include "FileSelector.h"
-#include "Rectangle.h"
-#include "Globals.h"
-#include "Help.h"
+#include "TrackFrame.h"
+#include "TrackWindow.h"
#include <wx/button.h>
#include <wx/checkbox.h>
@@ -49,8 +50,8 @@
#include <wx/stattext.h>
#include <wx/toolbar.h>
+#include <fstream>
#include <iostream>
-#include <fstream>
using namespace std;
@@ -78,7 +79,6 @@
#define MEN_HAUNSCH 23
#define MEN_ANALYZE 24
#define MEN_IONSCALE 25
-#define MEN_SETTINGS 26
#include "Bitmaps/open.xpm"
@@ -1492,7 +1492,7 @@
TransposeSelection();
break;
- case MEN_SETTINGS:
+ case ID_VIEW_SETTINGS:
SettingsDialog();
break;
@@ -2000,7 +2000,7 @@
// EVT_MENU(MEN_ANALYZE,
// EVT_MENU(MEN_TRANSPOSE,
-// EVT_MENU(MEN_SETTINGS,
+// EVT_MENU(ID_VIEW_SETTINGS,
END_EVENT_TABLE()
@@ -2028,7 +2028,7 @@
wxMenu* pSettingsMenu = new wxMenu;
pSettingsMenu->Append(MEN_EDIT, "&Chord");
- pSettingsMenu->Append(MEN_SETTINGS, "&Global");
+ pSettingsMenu->Append(ID_VIEW_SETTINGS, "&Global");
pSettingsMenu->Append(MEN_MIDI, "&Midi");
pSettingsMenu->Append(
MEN_HAUNSCH,
Modified: trunk/jazz/src/Resources.h
===================================================================
--- trunk/jazz/src/Resources.h 2010-05-10 00:30:40 UTC (rev 779)
+++ trunk/jazz/src/Resources.h 2010-05-10 03:09:56 UTC (rev 780)
@@ -30,14 +30,19 @@
// of wxID_HIGHEST here.
#define wxID_HIGHEST 5999
-#define ID_EXPORT_MIDI wxID_HIGHEST + 1
-#define ID_EXPORT_SELECTION_AS_MIDI wxID_HIGHEST + 2
+#define ID_FILE_REVERT_TO_SAVED wxID_HIGHEST + 1
+#define ID_EXPORT_MIDI wxID_HIGHEST + 2
+#define ID_EXPORT_SELECTION_AS_MIDI wxID_HIGHEST + 3
+
#define ID_SETTINGS_METRONOME wxID_HIGHEST + 10
#define ID_SETTINGS_SYNTHESIZER wxID_HIGHEST + 11
#define ID_SETTINGS_MIDI_DEVICE wxID_HIGHEST + 12
+#define ID_SETTINGS_PITCH_PAINTER wxID_HIGHEST + 13
+#define ID_SETTINGS_WAHWAH wxID_HIGHEST + 14
#define ID_EDIT_PASTE_MERGE wxID_HIGHEST + 15
+#define ID_EDIT_MAXIMIZE_VOLUME wxID_HIGHEST + 16
#define ID_AUDIO_GLOBAL_SETTINGS wxID_HIGHEST + 20
#define ID_AUDIO_SAMPLE_SETTINGS wxID_HIGHEST + 21
@@ -46,49 +51,66 @@
#define ID_AUDIO_SAVE_SAMPLE_SET_AS wxID_HIGHEST + 24
#define ID_AUDIO_NEW_SAMPLE_SET wxID_HIGHEST + 25
-#define ID_TRIM wxID_HIGHEST + 30
-#define ID_QUANTIZE wxID_HIGHEST + 31
-#define ID_SET_CHANNEL wxID_HIGHEST + 32
-#define ID_SHIFT wxID_HIGHEST + 33
-#define ID_SHIFT_LEFT wxID_HIGHEST + 34
-#define ID_SHIFT_RIGHT wxID_HIGHEST + 35
-#define ID_SNAP wxID_HIGHEST + 36
-#define ID_SNAP_8 wxID_HIGHEST + 37
-#define ID_SNAP_8D wxID_HIGHEST + 38
-#define ID_SNAP_16 wxID_HIGHEST + 39
-#define ID_SNAP_16D wxID_HIGHEST + 40
-#define ID_MIXER wxID_HIGHEST + 41
-#define ID_PIANOWIN wxID_HIGHEST + 42
-#define ID_METRONOME_TOGGLE wxID_HIGHEST + 43
-#define ID_VELOCITY wxID_HIGHEST + 44
-#define ID_LENGTH wxID_HIGHEST + 45
-#define ID_MISC_TRACK_MERGE wxID_HIGHEST + 46
-#define ID_MISC_SPLIT_TRACKS wxID_HIGHEST + 47
-#define ID_MISC_METER_CHANGE wxID_HIGHEST + 48
-#define ID_MISC_RESET_MIDI wxID_HIGHEST + 49
-#define ID_MISC_SET_COPYRIGHT wxID_HIGHEST + 50
-#define ID_TRANSPOSE wxID_HIGHEST + 51
-#define ID_CLEANUP wxID_HIGHEST + 52
-#define ID_SEARCH_AND_REPLACE wxID_HIGHEST + 53
+#define ID_EFFECTS_EQUALIZER wxID_HIGHEST + 27
+#define ID_EFFECTS_FILTER wxID_HIGHEST + 28
+#define ID_EFFECTS_DISTORTION wxID_HIGHEST + 29
+#define ID_EFFECTS_REVERB wxID_HIGHEST + 30
+#define ID_EFFECTS_ECHO wxID_HIGHEST + 31
+#define ID_EFFECTS_CHORUS wxID_HIGHEST + 32
+#define ID_EFFECTS_PITCH_SHIFTER wxID_HIGHEST + 33
+#define ID_EFFECTS_STRETCHER wxID_HIGHEST + 34
+#define ID_EFFECTS_REVERSE wxID_HIGHEST + 35
+#define ID_EFFECTS_SYNTH wxID_HIGHEST + 36
-#define ID_PLAY wxID_HIGHEST + 60
-#define ID_PLAY_LOOP wxID_HIGHEST + 61
-#define ID_RECORD wxID_HIGHEST + 62
+#define ID_PAINTERS_VOLUME wxID_HIGHEST + 37
+#define ID_PAINTER_WAHWAH wxID_HIGHEST + 38
+#define ID_PAINTER_PAN wxID_HIGHEST + 39
+#define ID_PAINTER_PITCH wxID_HIGHEST + 40
+#define ID_PAINTER_NONE wxID_HIGHEST + 41
-#define ID_SELECT wxID_HIGHEST + 65
+#define ID_TRIM wxID_HIGHEST + 50
+#define ID_QUANTIZE wxID_HIGHEST + 51
+#define ID_SET_CHANNEL wxID_HIGHEST + 52
+#define ID_SHIFT wxID_HIGHEST + 53
+#define ID_SHIFT_LEFT wxID_HIGHEST + 54
+#define ID_SHIFT_RIGHT wxID_HIGHEST + 55
+#define ID_SNAP wxID_HIGHEST + 56
+#define ID_SNAP_8 wxID_HIGHEST + 57
+#define ID_SNAP_8D wxID_HIGHEST + 58
+#define ID_SNAP_16 wxID_HIGHEST + 59
+#define ID_SNAP_16D wxID_HIGHEST + 60
+#define ID_MIXER wxID_HIGHEST + 61
+#define ID_PIANOWIN wxID_HIGHEST + 62
+#define ID_METRONOME_TOGGLE wxID_HIGHEST + 63
+#define ID_VELOCITY wxID_HIGHEST + 64
+#define ID_LENGTH wxID_HIGHEST + 65
+#define ID_MISC_TRACK_MERGE wxID_HIGHEST + 66
+#define ID_MISC_SPLIT_TRACKS wxID_HIGHEST + 67
+#define ID_MISC_METER_CHANGE wxID_HIGHEST + 68
+#define ID_MISC_RESET_MIDI wxID_HIGHEST + 69
+#define ID_MISC_SET_COPYRIGHT wxID_HIGHEST + 70
+#define ID_TRANSPOSE wxID_HIGHEST + 71
+#define ID_CLEANUP wxID_HIGHEST + 72
+#define ID_SEARCH_AND_REPLACE wxID_HIGHEST + 73
-#define ID_CHANGE_LENGTH wxID_HIGHEST + 70
+#define ID_PLAY wxID_HIGHEST + 80
+#define ID_PLAY_LOOP wxID_HIGHEST + 81
+#define ID_RECORD wxID_HIGHEST + 82
-#define ID_EVENT_DIALOG wxID_HIGHEST + 81
-#define ID_CUT_PASTE_EVENTS wxID_HIGHEST + 82
-#define ID_SHOW_ALL_EVENTS_FROM_ALL_TRACKS wxID_HIGHEST + 83
+#define ID_SELECT wxID_HIGHEST + 85
+#define ID_CHANGE_LENGTH wxID_HIGHEST + 90
+
+#define ID_EVENT_DIALOG wxID_HIGHEST + 91
+#define ID_CUT_PASTE_EVENTS wxID_HIGHEST + 92
+#define ID_SHOW_ALL_EVENTS_FROM_ALL_TRACKS wxID_HIGHEST + 93
+
#define ID_TOOLS_HARMONY_BROWSER wxID_HIGHEST + 95
#define ID_HELP_PIANO_WINDOW wxID_HIGHEST + 100
#define MEN_CLEAR wxID_HIGHEST + 110
-#define MEN_SETTINGS wxID_HIGHEST + 120
+#define ID_VIEW_SETTINGS wxID_HIGHEST + 120
#define IDC_KB_VOLUME wxID_HIGHEST + 1000
Modified: trunk/jazz/src/Rhythm.cpp
===================================================================
--- trunk/jazz/src/Rhythm.cpp 2010-05-10 00:30:40 UTC (rev 779)
+++ trunk/jazz/src/Rhythm.cpp 2010-05-10 03:09:56 UTC (rev 780)
@@ -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
@@ -496,9 +496,6 @@
// ============================ tRhythmWin ==============================
-#define MEN_CLOSE 1
-#define MEN_LOAD 2
-#define MEN_SAVE 3
#define MEN_HELP 4
#define MEN_ADD 5
#define MEN_DEL 6
@@ -538,8 +535,8 @@
JZToolDef tdefs[] =
{
- { MEN_LOAD, FALSE, open_xpm, "open rhythm file" },
- { MEN_SAVE, FALSE, save_xpm, "save into rhythm file" },
+ { wxID_OPEN, FALSE, open_xpm, "open rhythm file" },
+ { wxID_SAVE, FALSE, save_xpm, "save into rhythm file" },
{ JZToolBar::eToolBarSeparator },
{ MEN_ADD, FALSE, rrgadd_xpm, "add instrument" },
{ MEN_DEL, FALSE, rrgdel_xpm, "remove instrument" },
@@ -562,9 +559,9 @@
wxMenuBar *menu_bar = new wxMenuBar;
wxMenu *menu = new wxMenu;
- menu->Append(MEN_LOAD, "&Load");
- menu->Append(MEN_SAVE, "&Save");
- menu->Append(MEN_CLOSE, "&Close");
+ menu->Append(wxID_OPEN, "&Load");
+ menu->Append(wxID_SAVE, "&Save");
+ menu->Append(wxID_CLOSE, "&Close");
menu_bar->Append(menu, "&File");
menu = new wxMenu;
@@ -756,14 +753,14 @@
Help();
break;
- case MEN_CLOSE:
+ case wxID_CLOSE:
// motif crashes, when Show(FALSE) is called before destructor!
// Show(FALSE);
// DELETE_THIS();
Destroy();
break;
- case MEN_LOAD:
+ case wxID_OPEN:
{
wxString fname = file_selector(
default_filename,
@@ -780,7 +777,7 @@
}
break;
- case MEN_SAVE:
+ case wxID_SAVE:
{
Win2Instrument();
wxString fname = file_selector(
Modified: trunk/jazz/src/SampleWindow.cpp
===================================================================
--- trunk/jazz/src/SampleWindow.cpp 2010-05-10 00:30:40 UTC (rev 779)
+++ trunk/jazz/src/SampleWindow.cpp 2010-05-10 03:09:56 UTC (rev 780)
@@ -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
@@ -45,41 +45,15 @@
//DEBUG#include <iostream>
-#define MEN_LOAD 1
-#define MEN_SAVE 2
-#define MEN_CLOSE 3
-#define MEN_PLAY 4
#define MEN_HELP 5
-#define MEN_SAVEAS 6
-#define MEN_REVERT 7
-#define MEN_VOLUME_MAX 19
-#define MEN_VOLUME_PNT 20
-
#define MEN_SILENCE 21
#define MEN_SILENCE_INS 22
#define MEN_SILENCE_APP 23
#define MEN_SILENCE_OVR 24
-#define MEN_WAHWAH 25
-#define MEN_WAHSETTINGS 26
-#define MEN_PAN_PNT 27
-#define MEN_TRANSP_PNT 28
-#define MEN_TRANSP_SET 29
-
#define MEN_ACCEPT 42
-#define MEN_CANCEL 43
-#define MEN_ECHO 44
-#define MEN_DISTORTION 45
-#define MEN_EQUALIZER 46
-#define MEN_REVERB 47
-#define MEN_SHIFTER 48
-#define MEN_REVERSE 49
-#define MEN_FILTER 51
-#define MEN_CHORUS 52
-#define MEN_STEREO 53
-#define MEN_STRETCHER 54
-#define MEN_SYNTH 55
+
#define MEN_FLIP 56
#define MEN_FLIP_LEFT 57
#define MEN_FLIP_RIGHT 58
@@ -692,22 +666,29 @@
#include "Bitmaps/zoomin.xpm"
#include "Bitmaps/zoomout.xpm"
-static JZToolDef tdefs[] = {
- { MEN_LOAD, FALSE, open_xpm, "open wave file" },
- { MEN_SAVE, FALSE, save_xpm, "save wave file" },
+static JZToolDef tdefs[] =
+{
+ { wxID_OPEN, FALSE, open_xpm, "open wave file" },
+ { wxID_SAVE, FALSE, save_xpm, "save wave file" },
{ JZToolBar::eToolBarSeparator },
{ wxID_ZOOM_IN, FALSE, zoomin_xpm, "zoom to selection" },
{ wxID_ZOOM_OUT, FALSE, zoomout_xpm, "zoom out" },
{ MEN_ACCEPT, FALSE, accept_xpm, "accept painting" },
- { MEN_CANCEL, FALSE, cancel_xpm, "cancel painting" },
+ { ID_PAINTER_NONE, FALSE, cancel_xpm, "cancel painting" },
{ JZToolBar::eToolBarSeparator },
- { MEN_PLAY, FALSE, play_xpm, "play sample" },
+ { ID_PLAY, FALSE, play_xpm, "play sample" },
{ MEN_HELP, FALSE, help_xpm, "help" },
{ JZToolBar::eToolBarEnd }
};
-int tSampleWin::geo[4] = { 30, 30, 600, 300 };
+int tSampleWin::geo[4] =
+{
+ 30,
+ 30,
+ 600,
+ 300
+};
tSample *tSampleWin::copy_buffer;
@@ -763,11 +744,11 @@
// Create and populate the File menu.
pMenu = new wxMenu;
- pMenu->Append(MEN_REVERT, "&Revert to Saved");
- pMenu->Append(MEN_LOAD, "&Load...");
+ pMenu->Append(ID_FILE_REVERT_TO_SAVED, "&Revert to Saved");
+ pMenu->Append(wxID_OPEN, "&Load...");
pMenu->Append(wxID_SAVE, "&Save");
pMenu->Append(wxID_SAVEAS, "&Save As...");
- pMenu->Append(MEN_CLOSE, "&Close");
+ pMenu->Append(wxID_CLOSE, "&Close");
pMenuBar->Append(pMenu, "&File");
@@ -786,37 +767,37 @@
pSubMenu->Append(MEN_FLIP_LEFT, "Left");
pSubMenu->Append(MEN_FLIP_RIGHT, "Right");
pMenu->Append(MEN_FLIP, "In&vert Phase", pSubMenu);
- pMenu->Append(MEN_VOLUME_MAX, "&Maximize Volume");
- pMenuBar->Append(pMenu, "&Edit");
+ pMenu->Append(ID_EDIT_MAXIMIZE_VOLUME, "&Maximize Volume");
+ pMenuBar->Append(pMenu, "&Edit");
pMenu = new wxMenu;
- pMenu->Append(MEN_VOLUME_PNT, "&Volume...");
- pMenu->Append(MEN_PAN_PNT, "&Panpot...");
- pMenu->Append(MEN_TRANSP_PNT, "&Pitch...");
- pMenu->Append(MEN_WAHWAH, "&Filter...");
- pMenu->Append(MEN_CANCEL, "&None...");
+ pMenu->Append(ID_PAINTERS_VOLUME, "&Volume...");
+ pMenu->Append(ID_PAINTER_PAN, "&Panpot...");
+ pMenu->Append(ID_PAINTER_PITCH, "&Pitch...");
+ pMenu->Append(ID_PAINTER_WAHWAH, "&Filter...");
+ pMenu->Append(ID_PAINTER_NONE, "&None...");
pMenuBar->Append(pMenu, "&Painters");
pMenu = new wxMenu;
- pMenu->Append(MEN_EQUALIZER, "&Equalizer...");
- pMenu->Append(MEN_FILTER, "&Filter...");
- pMenu->Append(MEN_DISTORTION, "&Distortion...");
- pMenu->Append(MEN_REVERB, "&Reverb...");
- pMenu->Append(MEN_ECHO, "&Echo...");
- pMenu->Append(MEN_CHORUS, "&Chorus...");
- pMenu->Append(MEN_SHIFTER, "&Pitch shifter...");
- pMenu->Append(MEN_STRETCHER, "&Time stretcher...");
- pMenu->Append(MEN_REVERSE, "Re&verse");
- pMenu->Append(MEN_SYNTH, "&Synth...");
+ pMenu->Append(ID_EFFECTS_EQUALIZER, "&Equalizer...");
+ pMenu->Append(ID_EFFECTS_FILTER, "&Filter...");
+ pMenu->Append(ID_EFFECTS_DISTORTION, "&Distortion...");
+ pMenu->Append(ID_EFFECTS_REVERB, "&Reverb...");
+ pMenu->Append(ID_EFFECTS_ECHO, "&Echo...");
+ pMenu->Append(ID_EFFECTS_CHORUS, "&Chorus...");
+ pMenu->Append(ID_EFFECTS_PITCH_SHIFTER, "&Pitch shifter...");
+ pMenu->Append(ID_EFFECTS_STRETCHER, "&Time stretcher...");
+ pMenu->Append(ID_EFFECTS_REVERSE, "Re&verse");
+ pMenu->Append(ID_EFFECTS_SYNTH, "&Synth...");
pMenuBar->Append(pMenu, "&Effects");
pMenu = new wxMenu;
- pMenu->Append(MEN_TRANSP_SET, "&Pitch Painter...");
- pMenu->Append(MEN_WAHSETTINGS, "&Filter Painter...");
+ pMenu->Append(ID_SETTINGS_PITCH_PAINTER, "&Pitch Painter...");
+ pMenu->Append(ID_SETTINGS_WAHWAH, "&Filter Painter...");
// pMenu->Append(wxID_ZOOM_IN, "Zoom &In");
// pMenu->Append(wxID_ZOOM_OUT, "Zoom &Out");
- pMenu->Append(MEN_SETTINGS, "&View Settings...");
- pMenuBar->Append(pMenu, "&Settings");
+ pMenu->Append(ID_VIEW_SETTINGS, "&View Settings...");
+ pMenuBar->Append(pMenu, "&Settings");
SetMenuBar(pMenuBar);
@@ -1012,14 +993,14 @@
}
// Player crashes if data disappear.
- if (id != MEN_PLAY)
+ if (id != ID_PLAY)
{
cnvs->playpos->StopListen();
}
switch (id)
{
- case MEN_EQUALIZER:
+ case ID_EFFECTS_EQUALIZER:
if (equalizer == 0)
equalizer = new tEqualizer(*this);
equalizer->Show(TRUE);
@@ -1032,13 +1013,13 @@
spl.Flip(1);
break;
- case MEN_DISTORTION:
+ case ID_EFFECTS_DISTORTION:
if (distortion == 0)
distortion = new tDistortion(*this);
distortion->Show(TRUE);
break;
- case MEN_REVERB:
+ case ID_EFFECTS_REVERB:
#ifdef OBSOLETE
if (reverb == 0)
{
@@ -1054,7 +1035,7 @@
#endif
break;
- case MEN_REVERSE:
+ case ID_EFFECTS_REVERSE:
{
int fr, to;
if (HaveSelection(fr, to))
@@ -1065,7 +1046,7 @@
}
break;
- case MEN_SHIFTER:
+ case ID_EFFECTS_PITCH_SHIFTER:
#ifdef OBSOLETE
if (shifter == 0)
{
@@ -1080,7 +1061,7 @@
#endif
break;
- case MEN_STRETCHER:
+ case ID_EFFECTS_STRETCHER:
#ifdef OBSOLETE
if (stretcher == 0)
{
@@ -1095,7 +1076,7 @@
#endif
break;
- case MEN_FILTER:
+ case ID_EFFECTS_FILTER:
#ifdef OBSOLETE
if (filter == 0)
{
@@ -1108,7 +1089,7 @@
#endif
break;
- case MEN_SETTINGS:
+ case ID_VIEW_SETTINGS:
#ifdef OBSOLETE
if (settings == 0)
{
@@ -1121,7 +1102,7 @@
#endif
break;
- case MEN_ECHO:
+ case ID_EFFECTS_ECHO:
#ifdef OBSOLETE
if (echo == 0)
{
@@ -1136,7 +1117,7 @@
#endif
break;
- case MEN_CHORUS:
+ case ID_EFFECTS_CHORUS:
#ifdef OBSOLETE
if (chorus == 0)
{
@@ -1151,7 +1132,7 @@
#endif
break;
- case MEN_SYNTH:
+ case ID_EFFECTS_SYNTH:
if (synth == 0)
synth = new tSynthDlg(*this);
synth->Show(TRUE);
@@ -1168,7 +1149,7 @@
}
break;
- case MEN_CANCEL:
+ case ID_PAINTER_NONE:
if (on_accept)
{
delete on_accept;
@@ -1209,22 +1190,22 @@
SetViewPos(0, spl.GetLength());
break;
- case MEN_VOLUME_MAX:
+ case ID_EDIT_MAXIMIZE_VOLUME:
spl.Rescale();
Redraw();
break;
- case MEN_VOLUME_PNT:
+ case ID_PAINTERS_VOLUME:
delete on_accept;
on_accept = new tCommandPainter(*this, vol_command);
break;
- case MEN_WAHWAH:
+ case ID_PAINTER_WAHWAH:
delete on_accept;
on_accept = new tCommandPainter(*this, wah_command);
break;
- case MEN_WAHSETTINGS:
+ case ID_SETTINGS_WAHWAH:
#ifdef OBSOLETE
if (wah_settings == 0)
{
@@ -1237,7 +1218,7 @@
#endif
break;
- case MEN_TRANSP_SET:
+ case ID_SETTINGS_PITCH_PAINTER:
#ifdef OBSOLETE
if (pitch_settings == 0)
{
@@ -1251,7 +1232,7 @@
break;
- case MEN_PAN_PNT:
+ case ID_PAINTER_PAN:
delete on_accept;
on_accept = new tCommandPainter(*this, pan_command);
break;
@@ -1319,39 +1300,46 @@
}
break;
- case MEN_TRANSP_PNT:
+ case ID_PAINTER_PITCH:
delete on_accept;
SetViewPos(0, spl.GetLength());
on_accept = new tCommandPainter(*this, pitch_command);
break;
- case MEN_REVERT:
+ case ID_FILE_REVERT_TO_SAVED:
cnvs->ClearSelection();
if (spl.Load(TRUE))
LoadError(spl);
Redraw();
break;
- case MEN_CLOSE:
+ case wxID_CLOSE:
// DELETE_THIS();
Destroy();
break;
- case MEN_PLAY:
+ case ID_PLAY:
cnvs->Play();
break;
- case MEN_LOAD:
+ case wxID_OPEN:
{
char *defname = copystring(spl.GetFilename());
- wxString fname = file_selector(defname, "Load Sample", FALSE, FALSE, "*.wav");
+ wxString fname = file_selector(
+ defname,
+ "Load Sample",
+ FALSE,
+ FALSE,
+ "*.wav");
if (!fname.empty())
{
wxBeginBusyCursor();
cnvs->ClearSelection();
spl.SetFilename(fname);
if (spl.Load(TRUE))
+ {
LoadError(spl);
+ }
spl->RefreshDialogs();
SetTitle(fname);
Redraw();
@@ -1361,14 +1349,19 @@
}
break;
- case MEN_SAVEAS:
+ case wxID_SAVEAS:
{
char *defname = copystring(spl.GetFilename());
- wxString fname = file_selector(defname, "Save Sample", TRUE, FALSE, "*.wav");
+ wxString fname = file_selector(
+ defname,
+ "Save Sample",
+ TRUE,
+ FALSE,
+ "*.wav");
if (!fname.empty())
{
spl.SetFilename(fname);
- OnMenuCommand(MEN_SAVE);
+ OnMenuCommand(wxID_SAVE);
spl->RefreshDialogs();
SetTitle(fname);
}
@@ -1376,11 +1369,11 @@
}
break;
- case MEN_SAVE:
+ case wxID_SAVE:
{
if (spl.GetFilename()[0] == 0)
{
- OnMenuCommand(MEN_SAVEAS);
+ OnMenuCommand(wxID_SAVEAS);
}
else
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
