Menu
▾
▴
SF.net SVN: jazzplusplus:[709] trunk/jazz
|
From: <pst...@us...> - 2009-02-17 01:13:20
|
Revision: 709
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=709&view=rev
Author: pstieber
Date: 2009-02-17 01:13:18 +0000 (Tue, 17 Feb 2009)
Log Message:
-----------
1. Removed the ResourceDialog.cpp/.h code from the build.
2. Used the JEValueAlterationMode enumeration in the velocity and
length commands. Also made the data members in the velocity and
length commands private.
3. Removed the old velocity dialog.
4. Changed include paths in the delete dialog source file.
5. Implemented a new velocity dialog and started using it in the event window..
Modified Paths:
--------------
trunk/jazz/src/Command.cpp
trunk/jazz/src/Command.h
trunk/jazz/src/Dialogs/DeleteDialog.cpp
trunk/jazz/src/Dialogs/VelocityDialog.cpp
trunk/jazz/src/Dialogs/VelocityDialog.h
trunk/jazz/src/Dialogs.cpp
trunk/jazz/src/Dialogs.h
trunk/jazz/src/EventWindow.cpp
trunk/jazz/src/Makefile.am
trunk/jazz/src/PianoFrame.cpp
trunk/jazz/src/PianoWindow.cpp
trunk/jazz/vc8/JazzPlusPlus-VC8.vcproj
trunk/jazz/vc9/JazzPlusPlus-VC9.vcproj
Modified: trunk/jazz/src/Command.cpp
===================================================================
--- trunk/jazz/src/Command.cpp 2009-02-17 00:51:53 UTC (rev 708)
+++ trunk/jazz/src/Command.cpp 2009-02-17 01:13:18 UTC (rev 709)
@@ -475,12 +475,16 @@
// tCmdVelocity
// ************************************************************************
-tCmdVelocity::tCmdVelocity(JZFilter* pFilter, int from, int to, int m)
- : tCommand(pFilter)
+tCmdVelocity::tCmdVelocity(
+ JZFilter* pFilter,
+ int FromValue,
+ int ToValue,
+ JEValueAlterationMode Mode)
+ : tCommand(pFilter),
+ mFromValue(FromValue),
+ mToValue(ToValue),
+ mMode(Mode)
{
- FromValue = from;
- ToValue = to;
- Mode = m;
}
void tCmdVelocity::ExecuteEvent(JZTrack* pTrack, JZEvent* pEvent)
@@ -490,23 +494,27 @@
if (pEvent->IsKeyOn() != 0)
{
pKeyOn = (tKeyOn *)pEvent->Copy();
- long val = 0;
- if (ToValue <= 0)
- val = FromValue;
+ int Value = 0;
+ if (mToValue <= 0)
+ {
+ Value = mFromValue;
+ }
else
- val = Interpolate(pKeyOn->GetClock(), FromValue, ToValue);
- switch (Mode)
{
- case 0:
+ Value = Interpolate(pKeyOn->GetClock(), mFromValue, mToValue);
+ }
+ switch (mMode)
+ {
+ case eSetValues:
break;
- case 1:
- val = pKeyOn->GetVelocity() + val;
+ case eAddValues:
+ Value = pKeyOn->GetVelocity() + Value;
break;
- case 2:
- val = pKeyOn->GetVelocity() - val;
+ case eSubtractValues:
+ Value = pKeyOn->GetVelocity() - Value;
break;
}
- pKeyOn->SetVelocity(val < 1 ? 1 : (val > 127 ? 127 : val));
+ pKeyOn->SetVelocity(Value < 1 ? 1 : (Value > 127 ? 127 : Value));
pTrack->Kill(pEvent);
pTrack->Put(pKeyOn);
}
@@ -516,12 +524,16 @@
// tCmdLength
// ************************************************************************
-tCmdLength::tCmdLength(JZFilter* pFilter, int from, int to, int m)
- : tCommand(pFilter)
+tCmdLength::tCmdLength(
+ JZFilter* pFilter,
+ int FromValue,
+ int ToValue,
+ JEValueAlterationMode Mode)
+ : tCommand(pFilter),
+ mFromValue(FromValue),
+ mToValue(ToValue),
+ mMode(Mode)
{
- FromValue = from;
- ToValue = to;
- Mode = m;
}
void tCmdLength::ExecuteEvent(JZTrack* pTrack, JZEvent* pEvent)
@@ -531,24 +543,28 @@
if (pEvent->IsKeyOn() != 0)
{
pKeyOn = (tKeyOn *)pEvent->Copy();
- long val = 0;
- if (ToValue <= 0)
- val = FromValue;
+ int Value = 0;
+ if (mToValue <= 0)
+ {
+ Value = mFromValue;
+ }
else
- val = Interpolate(pKeyOn->GetClock(), FromValue, ToValue);
- switch (Mode)
{
- case 0:
+ Value = Interpolate(pKeyOn->GetClock(), mFromValue, mToValue);
+ }
+ switch (mMode)
+ {
+ case eSetValues:
break;
- case 1:
- val = pKeyOn->GetEventLength() + val;
+ case eAddValues:
+ Value = pKeyOn->GetEventLength() + Value;
break;
- case 2:
- val = pKeyOn->GetEventLength() - val;
+ case eSubtractValues:
+ Value = pKeyOn->GetEventLength() - Value;
break;
}
- pKeyOn->SetLength(val < 1 ? 1 : val);
+ pKeyOn->SetLength(Value < 1 ? 1 : Value);
pTrack->Kill(pEvent);
pTrack->Put(pKeyOn);
}
@@ -558,8 +574,8 @@
// ************************************************************************
// tCmdSeqLength
-// JAVE this command is supposed to stretch/contract a sequence of events in time
-// by factor "scale" from starting point "startClock"
+// This command is supposed to stretch/contract a sequence of events in
+// time by factor "scale" from starting point "startClock"
// ************************************************************************
tCmdSeqLength::tCmdSeqLength(JZFilter* pFilter, double scale)
@@ -1029,7 +1045,7 @@
tKeyOn* pKeyOn = (tKeyOn *)pEvent->Copy();
int n_th = 0;
- // the n'th key from bottom ..
+ // the n'th key from bottom
for (i = 0; i <= pKeyOn->GetKey(); i++)
{
n_th += Keys[i];
Modified: trunk/jazz/src/Command.h
===================================================================
--- trunk/jazz/src/Command.h 2009-02-17 00:51:53 UTC (rev 708)
+++ trunk/jazz/src/Command.h 2009-02-17 01:13:18 UTC (rev 709)
@@ -23,6 +23,8 @@
#ifndef JZ_COMMAND_H
#define JZ_COMMAND_H
+#include "CommandUtilities.h"
+
class JZFilter;
class JZEvent;
class JZTrack;
@@ -107,9 +109,19 @@
class tCmdVelocity : public tCommand
{
public:
- int FromValue, ToValue, Mode;
- tCmdVelocity(JZFilter* pFilter, int From, int To, int Mode);
+
+ tCmdVelocity(
+ JZFilter* pFilter,
+ int From,
+ int To,
+ JEValueAlterationMode Mode);
+
virtual void ExecuteEvent(JZTrack* pTrack, JZEvent* pEvent);
+
+ private:
+
+ int mFromValue, mToValue;
+ JEValueAlterationMode mMode;
};
//*****************************************************************************
@@ -117,9 +129,19 @@
class tCmdLength : public tCommand
{
public:
- int FromValue, ToValue, Mode;
- tCmdLength(JZFilter* pFilter, int From, int To, int Mode);
+
+ tCmdLength(
+ JZFilter* pFilter,
+ int FromValue,
+ int ToValue,
+ JEValueAlterationMode Mode);
+
virtual void ExecuteEvent(JZTrack* pTrack, JZEvent* pEvent);
+
+ private:
+
+ int mFromValue, mToValue;
+ JEValueAlterationMode mMode;
};
//*****************************************************************************
Modified: trunk/jazz/src/Dialogs/DeleteDialog.cpp
===================================================================
--- trunk/jazz/src/Dialogs/DeleteDialog.cpp 2009-02-17 00:51:53 UTC (rev 708)
+++ trunk/jazz/src/Dialogs/DeleteDialog.cpp 2009-02-17 01:13:18 UTC (rev 709)
@@ -20,8 +20,8 @@
#include "DeleteDialog.h"
-#include "Globals.h"
-#include "Help.h"
+#include "../Globals.h"
+#include "../Help.h"
#include <wx/button.h>
#include <wx/checkbox.h>
Modified: trunk/jazz/src/Dialogs/VelocityDialog.cpp
===================================================================
--- trunk/jazz/src/Dialogs/VelocityDialog.cpp 2009-02-17 00:51:53 UTC (rev 708)
+++ trunk/jazz/src/Dialogs/VelocityDialog.cpp 2009-02-17 01:13:18 UTC (rev 709)
@@ -1,5 +1,229 @@
+//*****************************************************************************
+// The JAZZ++ Midi Sequencer
+//
+// Copyright (C) 2009 Peter J. Stieber, all rights reserved.
+//
+// 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
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+//*****************************************************************************
+
#include "VelocityDialog.h"
-JZVelocityDialog::JZVelocityDialog()
+#include "../Globals.h"
+#include "../Help.h"
+#include "../Knob.h"
+#include "../Resources.h"
+
+#include <wx/button.h>
+#include <wx/radiobox.h>
+#include <wx/sizer.h>
+#include <wx/stattext.h>
+
+#include <sstream>
+
+using namespace std;
+
+//*****************************************************************************
+//*****************************************************************************
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+BEGIN_EVENT_TABLE(JZVelocityDialog, wxDialog)
+
+ EVT_KNOB_CHANGED(
+ IDC_KB_VELOCITY_START,
+ JZVelocityDialog::OnVelocityStartChange)
+
+ EVT_KNOB_CHANGED(
+ IDC_KB_VELOCITY_STOP,
+ JZVelocityDialog::OnVelocityStopChange)
+
+ EVT_BUTTON(wxID_HELP, JZVelocityDialog::OnHelp)
+
+END_EVENT_TABLE()
+
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+JZVelocityDialog::JZVelocityDialog(
+ wxWindow* pParent,
+ int& FromValue,
+ int& ToValue,
+ JEValueAlterationMode& Mode)
+ : wxDialog(pParent, wxID_ANY, wxString("Velocity")),
+ mFromValue(FromValue),
+ mToValue(ToValue),
+ mMode(Mode),
+ mpVelocityStartKnob(0),
+ mpVelocityStartValue(0),
+ mpVelocityStopKnob(0),
+ mpVelocityStopValue(0),
+ mpModeRadioBox(0)
{
+ mpVelocityStartKnob = new JZKnob(this, IDC_KB_VELOCITY_START, 0, 0, 127);
+ mpVelocityStartValue = new wxStaticText(this, wxID_ANY, "000");
+
+ mpVelocityStopKnob = new JZKnob(this, IDC_KB_VELOCITY_STOP, 0, 0, 127);
+ mpVelocityStopValue = new wxStaticText(this, wxID_ANY, "000");
+
+ wxString Choices[] =
+ {
+ "Set Values",
+ "Add To Value",
+ "Subtract From Values"
+ };
+ mpModeRadioBox = new wxRadioBox(
+ this,
+ wxID_ANY,
+ "Value Application Mode",
+ wxDefaultPosition,
+ wxDefaultSize,
+ 3,
+ Choices,
+ 1,
+ wxRA_SPECIFY_COLS);
+
+ wxButton* pOkButton = new wxButton(this, wxID_OK, "&OK");
+ wxButton* pCancelButton = new wxButton(this, wxID_CANCEL, "Cancel");
+ wxButton* pHelpButton = new wxButton(this, wxID_HELP, "Help");
+ pOkButton->SetDefault();
+
+ wxBoxSizer* pTopSizer = new wxBoxSizer(wxVERTICAL);
+
+ wxFlexGridSizer* pFlexGridSizer = new wxFlexGridSizer(2, 3, 4, 2);
+
+ pFlexGridSizer->Add(
+ new wxStaticText(this, wxID_ANY, "Start Velocity:"),
+ 0,
+ wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL);
+ pFlexGridSizer->Add(
+ mpVelocityStartValue,
+ 0,
+ wxALIGN_CENTER_VERTICAL | wxFIXED_MINSIZE);
+ pFlexGridSizer->Add(mpVelocityStartKnob, 0, wxALIGN_CENTER_VERTICAL);
+
+ pFlexGridSizer->Add(
+ new wxStaticText(this, wxID_ANY, "Stop Velocity:"),
+ 0,
+ wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL);
+ pFlexGridSizer->Add(
+ mpVelocityStopValue,
+ 0,
+ wxALIGN_CENTER_VERTICAL | wxFIXED_MINSIZE);
+ pFlexGridSizer->Add(mpVelocityStopKnob, 0, wxALIGN_CENTER_VERTICAL);
+
+ pTopSizer->Add(pFlexGridSizer, 0, wxALIGN_CENTER);
+
+ pTopSizer->Add(
+ mpModeRadioBox,
+ 0,
+ wxALIGN_CENTER | wxALL,
+ 5);
+
+ wxBoxSizer* pButtonSizer = new wxBoxSizer(wxHORIZONTAL);
+ pButtonSizer->Add(pOkButton, 0, wxALL, 5);
+ pButtonSizer->Add(pCancelButton, 0, wxALL, 5);
+ pButtonSizer->Add(pHelpButton, 0, wxALL, 5);
+
+ pTopSizer->Add(pButtonSizer, 0, wxALIGN_CENTER | wxBOTTOM, 6);
+
+ SetAutoLayout(true);
+ SetSizer(pTopSizer);
+
+ pTopSizer->SetSizeHints(this);
+ pTopSizer->Fit(this);
}
+
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+bool JZVelocityDialog::TransferDataToWindow()
+{
+ ostringstream Oss;
+
+ Oss << mFromValue;
+ mpVelocityStartValue->SetLabel(Oss.str().c_str());
+
+ mpVelocityStartKnob->SetValue(mFromValue);
+
+ Oss.str("");
+ Oss << mToValue;
+ mpVelocityStopValue->SetLabel(Oss.str().c_str());
+
+ mpVelocityStopKnob->SetValue(mToValue);
+
+ switch (mMode)
+ {
+ case eSetValues:
+ mpModeRadioBox->SetSelection(0);
+ break;
+ case eAddValues:
+ mpModeRadioBox->SetSelection(1);
+ break;
+ case eSubtractValues:
+ mpModeRadioBox->SetSelection(2);
+ break;
+ }
+
+ return true;
+}
+
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+bool JZVelocityDialog::TransferDataFromWindow()
+{
+ mFromValue = mpVelocityStartKnob->GetValue();
+
+ mToValue = mpVelocityStopKnob->GetValue();
+
+ int Selection = mpModeRadioBox->GetSelection();
+ if (Selection == 1)
+ {
+ mMode = eAddValues;
+ }
+ else if (Selection == 2)
+ {
+ mMode = eSubtractValues;
+ }
+ else
+ {
+ mMode = eSetValues;
+ }
+
+ return true;
+}
+
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+void JZVelocityDialog::OnVelocityStartChange(JZKnobEvent& Event)
+{
+ int Value = Event.GetValue();
+ ostringstream Oss;
+ Oss << Value;
+ mpVelocityStartValue->SetLabel(Oss.str().c_str());
+}
+
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+void JZVelocityDialog::OnVelocityStopChange(JZKnobEvent& Event)
+{
+ int Value = Event.GetValue();
+ ostringstream Oss;
+ Oss << Value;
+ mpVelocityStopValue->SetLabel(Oss.str().c_str());
+}
+
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+void JZVelocityDialog::OnHelp(wxCommandEvent& Event)
+{
+ gpHelpInstance->ShowTopic("Velocity");
+}
Modified: trunk/jazz/src/Dialogs/VelocityDialog.h
===================================================================
--- trunk/jazz/src/Dialogs/VelocityDialog.h 2009-02-17 00:51:53 UTC (rev 708)
+++ trunk/jazz/src/Dialogs/VelocityDialog.h 2009-02-17 01:13:18 UTC (rev 709)
@@ -1,14 +1,72 @@
+//*****************************************************************************
+// The JAZZ++ Midi Sequencer
+//
+// Copyright (C) 2009 Peter J. Stieber, all rights reserved.
+//
+// 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
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+//*****************************************************************************
+
#ifndef JZ_VELOCITYDIALOG_H
#define JZ_VELOCITYDIALOG_H
+#include "../CommandUtilities.h"
+
#include <wx/dialog.h>
+class JZKnob;
+class JZKnobEvent;
+class wxStaticText;
+
+//*****************************************************************************
+//*****************************************************************************
class JZVelocityDialog : public wxDialog
{
public:
- JZVelocityDialog();
+ JZVelocityDialog(
+ wxWindow* pParent,
+ int& FromValue,
+ int& ToValue,
+ JEValueAlterationMode& Mode);
+ private:
+
+ virtual bool TransferDataToWindow();
+
+ virtual bool TransferDataFromWindow();
+
+ void OnVelocityStartChange(JZKnobEvent& Event);
+
+ void OnVelocityStopChange(JZKnobEvent& Event);
+
+ void OnHelp(wxCommandEvent& Event);
+
+ private:
+
+ int& mFromValue;
+ int& mToValue;
+ JEValueAlterationMode& mMode;
+
+ JZKnob* mpVelocityStartKnob;
+ wxStaticText* mpVelocityStartValue;
+ JZKnob* mpVelocityStopKnob;
+ wxStaticText* mpVelocityStopValue;
+
+ wxRadioBox* mpModeRadioBox;
+
+ DECLARE_EVENT_TABLE();
};
#endif // !defined(JZ_VELOCITYDIALOG_H)
Modified: trunk/jazz/src/Dialogs.cpp
===================================================================
--- trunk/jazz/src/Dialogs.cpp 2009-02-17 00:51:53 UTC (rev 708)
+++ trunk/jazz/src/Dialogs.cpp 2009-02-17 01:13:18 UTC (rev 709)
@@ -331,64 +331,13 @@
//*****************************************************************************
-// Velocity
-//*****************************************************************************
-
-int tVelocityDlg::FromValue = 64;
-int tVelocityDlg::ToValue = 0;
-int tVelocityDlg::Mode = 0;
-
-
-tVelocityDlg::tVelocityDlg(JZFilter *f)
-: tPropertyListDlg( "Velocity" )
-{
- Filter = f;
- Song = f->GetSong();
-}
-
-
-bool tVelocityDlg::OnClose()
-{
- tCmdVelocity cmd(Filter, FromValue, ToValue, Mode);
- cmd.Execute();
- return false;
-}
-
-void tVelocityDlg::OnHelp()
-{
- gpHelpInstance->ShowTopic("Velocity");
-}
-
-void tVelocityDlg::AddProperties()
-{
- sheet->AddProperty(new wxProperty(
- "Start",
- wxPropertyValue(&FromValue),
- "integer",
- new wxIntegerListValidator(0, 127)));
- sheet->AddProperty(new wxProperty(
- "Stop",
- wxPropertyValue(&ToValue),
- "integer",
- new wxIntegerListValidator(0, 127)));
- sheet->AddProperty(new wxProperty(
- "Mode",
- tNamedValueListValue(&Mode, gModes),
- "props",
- new tNamedValueListValidator(gModes)));
-}
-
-
-
-
-//*****************************************************************************
// Length
//*****************************************************************************
int tLengthDlg::FromValue = 30;
int tLengthDlg::ToValue = 0;
-int tLengthDlg::Mode;
+JEValueAlterationMode tLengthDlg::Mode;
tLengthDlg::tLengthDlg(JZEventWindow* w, JZFilter *f)
: tPropertyListDlg("Length")
@@ -433,11 +382,11 @@
wxPropertyValue(&ToValue),
"integer",
new wxIntegerListValidator(0, Song->GetTicksPerQuarter() * 4)));
- sheet->AddProperty(new wxProperty(
- "Mode",
- tNamedValueListValue(&Mode, gModes),
- "props",
- new tNamedValueListValidator(gModes)));
+// sheet->AddProperty(new wxProperty(
+// "Mode",
+// tNamedValueListValue(&Mode, gModes),
+// "props",
+// new tNamedValueListValidator(gModes)));
}
Modified: trunk/jazz/src/Dialogs.h
===================================================================
--- trunk/jazz/src/Dialogs.h 2009-02-17 00:51:53 UTC (rev 708)
+++ trunk/jazz/src/Dialogs.h 2009-02-17 01:13:18 UTC (rev 709)
@@ -23,6 +23,7 @@
#ifndef JZ_DIALOGS_H
#define JZ_DIALOGS_H
+#include "CommandUtilities.h"
#include "PropertyListDialog.h"
class JZPianoWindow;
@@ -119,29 +120,13 @@
void OnHelp();
};
-// Velocity
-class tVelocityDlg : public tPropertyListDlg
-{
- public:
-
- static int FromValue, ToValue, Mode;
- static char *mode_str;
-
- JZFilter *Filter;
- JZSong *Song;
-
- tVelocityDlg(JZFilter *f);
- void AddProperties();
- bool OnClose();
- void OnHelp();
-};
-
// Length
class tLengthDlg : public tPropertyListDlg
{
public:
- static int FromValue, ToValue, Mode;
+ static int FromValue, ToValue;
+ static JEValueAlterationMode Mode;
static char *mode_str;
JZFilter *Filter;
Modified: trunk/jazz/src/EventWindow.cpp
===================================================================
--- trunk/jazz/src/EventWindow.cpp 2009-02-17 00:51:53 UTC (rev 708)
+++ trunk/jazz/src/EventWindow.cpp 2009-02-17 01:13:18 UTC (rev 709)
@@ -25,6 +25,7 @@
#include "Command.h"
#include "Dialogs/DeleteDialog.h"
#include "Dialogs/ShiftDialog.h"
+#include "Dialogs/VelocityDialog.h"
#include "Dialogs.h"
#include "EventFrame.h"
#include "Filter.h"
@@ -205,8 +206,16 @@
//-----------------------------------------------------------------------------
void JZEventWindow::Velocity()
{
- tVelocityDlg * dlg = new tVelocityDlg(mpFilter);
- dlg->Create();
+ int FromValue = 64;
+ int ToValue = 0;
+ JEValueAlterationMode Mode = eSetValues;
+
+ JZVelocityDialog VelocityDialog(this, FromValue, ToValue, Mode);
+ if (VelocityDialog.ShowModal() == wxID_OK)
+ {
+ tCmdVelocity VelocityCommand(mpFilter, FromValue, ToValue, Mode);
+ VelocityCommand.Execute();
+ }
}
//-----------------------------------------------------------------------------
Modified: trunk/jazz/src/Makefile.am
===================================================================
--- trunk/jazz/src/Makefile.am 2009-02-17 00:51:53 UTC (rev 708)
+++ trunk/jazz/src/Makefile.am 2009-02-17 01:13:18 UTC (rev 709)
@@ -71,7 +71,6 @@
Random.cpp \
RecordingInfo.cpp \
Rectangle.cpp \
-ResourceDialog.cpp \
Rhythm.cpp \
SampleCommand.cpp \
Sample.cpp \
@@ -152,7 +151,6 @@
Random.cpp \
RecordingInfo.cpp \
Rectangle.cpp \
-ResourceDialog.cpp \
Rhythm.cpp \
SampleCommand.cpp \
Sample.cpp \
@@ -237,7 +235,6 @@
Random.h \
RecordingInfo.h \
Rectangle.h \
-ResourceDialog.h \
Resources.h \
Rhythm.h \
SampleCommand.h \
Modified: trunk/jazz/src/PianoFrame.cpp
===================================================================
--- trunk/jazz/src/PianoFrame.cpp 2009-02-17 00:51:53 UTC (rev 708)
+++ trunk/jazz/src/PianoFrame.cpp 2009-02-17 01:13:18 UTC (rev 709)
@@ -37,7 +37,6 @@
#include "Player.h"
#include "GuitarFrame.h"
#include "ToolBar.h"
-#include "ResourceDialog.h"
#include "Help.h"
#include "Rectangle.h"
Modified: trunk/jazz/src/PianoWindow.cpp
===================================================================
--- trunk/jazz/src/PianoWindow.cpp 2009-02-17 00:51:53 UTC (rev 708)
+++ trunk/jazz/src/PianoWindow.cpp 2009-02-17 01:13:18 UTC (rev 709)
@@ -34,7 +34,6 @@
#include "PianoFrame.h"
#include "Player.h"
#include "ProjectManager.h"
-#include "ResourceDialog.h"
#include "Resources.h"
#include "SelectControllerDialog.h"
#include "Song.h"
@@ -3131,6 +3130,7 @@
//-----------------------------------------------------------------------------
void JZPianoWindow::ActivateSettingsDialog()
{
+/*
jppResourceDialog Dialog(this, "windowSettings");
Dialog.Attach("use_colours", &mUseColors);
@@ -3142,6 +3142,7 @@
SetScrollRanges();
Refresh();
}
+*/
}
//-----------------------------------------------------------------------------
@@ -3150,6 +3151,7 @@
//-----------------------------------------------------------------------------
void JZPianoWindow::ActivateMidiDelayDialog()
{
+/*
if (!EventsSelected())
{
return;
@@ -3173,12 +3175,14 @@
SetScrollRanges();
Refresh();
}
+*/
}
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
void JZPianoWindow::ActivateSequenceLengthDialog()
{
+/*
if (!EventsSelected())
{
return;
@@ -3198,4 +3202,5 @@
SetScrollRanges();
Refresh();
}
+*/
}
Modified: trunk/jazz/vc8/JazzPlusPlus-VC8.vcproj
===================================================================
--- trunk/jazz/vc8/JazzPlusPlus-VC8.vcproj 2009-02-17 00:51:53 UTC (rev 708)
+++ trunk/jazz/vc8/JazzPlusPlus-VC8.vcproj 2009-02-17 01:13:18 UTC (rev 709)
@@ -638,14 +638,6 @@
>
</File>
<File
- RelativePath="..\src\ResourceDialog.cpp"
- >
- </File>
- <File
- RelativePath="..\src\ResourceDialog.h"
- >
- </File>
- <File
RelativePath="..\src\Resources.h"
>
</File>
Modified: trunk/jazz/vc9/JazzPlusPlus-VC9.vcproj
===================================================================
--- trunk/jazz/vc9/JazzPlusPlus-VC9.vcproj 2009-02-17 00:51:53 UTC (rev 708)
+++ trunk/jazz/vc9/JazzPlusPlus-VC9.vcproj 2009-02-17 01:13:18 UTC (rev 709)
@@ -637,14 +637,6 @@
>
</File>
<File
- RelativePath="..\src\ResourceDialog.cpp"
- >
- </File>
- <File
- RelativePath="..\src\ResourceDialog.h"
- >
- </File>
- <File
RelativePath="..\src\Resources.h"
>
</File>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
