Menu
▾
▴
jazzplusplus-updates — SVN commit message list
You can subscribe to this list here.
| 2008 |
Jan
|
Feb
|
Mar
(58) |
Apr
(100) |
May
(92) |
Jun
(12) |
Jul
|
Aug
|
Sep
(5) |
Oct
(1) |
Nov
(26) |
Dec
(29) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2009 |
Jan
(31) |
Feb
(20) |
Mar
(1) |
Apr
|
May
(5) |
Jun
(10) |
Jul
|
Aug
(2) |
Sep
|
Oct
(2) |
Nov
|
Dec
(1) |
| 2010 |
Jan
(1) |
Feb
(1) |
Mar
|
Apr
(36) |
May
(10) |
Jun
|
Jul
(38) |
Aug
(2) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2011 |
Jan
|
Feb
(6) |
Mar
(8) |
Apr
|
May
|
Jun
|
Jul
(14) |
Aug
(56) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2012 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(13) |
Dec
(2) |
| 2013 |
Jan
(30) |
Feb
|
Mar
(43) |
Apr
(28) |
May
|
Jun
|
Jul
(2) |
Aug
|
Sep
|
Oct
(10) |
Nov
(2) |
Dec
|
| 2014 |
Jan
|
Feb
(2) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <pst...@us...> - 2013-03-17 23:18:13
|
Revision: 968
http://sourceforge.net/p/jazzplusplus/code/968
Author: pstieber
Date: 2013-03-17 23:18:10 +0000 (Sun, 17 Mar 2013)
Log Message:
-----------
Started adding rhythm generator and added import and export of ASCII MIDI files,
but commented out the menu entries because this is for debugging.
Modified Paths:
--------------
trunk/jazz/src/Project.cpp
trunk/jazz/src/Project.h
trunk/jazz/src/Track.cpp
trunk/jazz/src/Track.h
trunk/jazz/src/TrackFrame.cpp
trunk/jazz/src/TrackFrame.h
Modified: trunk/jazz/src/Project.cpp
===================================================================
--- trunk/jazz/src/Project.cpp 2013-03-17 23:13:43 UTC (rev 967)
+++ trunk/jazz/src/Project.cpp 2013-03-17 23:18:10 UTC (rev 968)
@@ -22,6 +22,7 @@
#include "Project.h"
+#include "AsciiMidiFile.h"
#include "Filter.h"
#include "GetOptionIndex.h"
#include "Globals.h"
@@ -515,12 +516,28 @@
{
JZStandardRead Io;
Clear();
- Read(Io, SongFileName.c_str());
+ Read(Io, SongFileName);
mpConfig->Put(C_StartUpSong, SongFileName);
}
//-----------------------------------------------------------------------------
// Description:
+// Open and read an ASCII MIDI file.
+//
+// Inputs:
+// const wxString& SongFileName:
+// Song path and file name.
+//-----------------------------------------------------------------------------
+void JZProject::OpenAndReadAsciiMidiFile(const wxString& AsciiMidiFileName)
+{
+ JZAsciiRead AsciiRead;
+ Clear();
+ Read(AsciiRead, AsciiMidiFileName);
+// mpConfig->Put(C_StartUpSong, SongFileName);
+}
+
+//-----------------------------------------------------------------------------
+// Description:
// Save a MIDI file. This function will overwrite the file if it already
// exists!
//
@@ -531,12 +548,20 @@
void JZProject::ExportMidiFile(const wxString& MidiFileName)
{
JZStandardWrite Io;
- Write(Io, MidiFileName.c_str());
+ Write(Io, MidiFileName);
mpConfig->Put(C_StartUpSong, MidiFileName);
}
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
+void JZProject::ExportAsciiMidiFile(const wxString& AsciiMidiFileName)
+{
+ JZAsciiWrite AsciiWrite;
+ Write(AsciiWrite, AsciiMidiFileName);
+}
+
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
void JZProject::Play()
{
mIsPlaying = true;
Modified: trunk/jazz/src/Project.h
===================================================================
--- trunk/jazz/src/Project.h 2013-03-17 23:13:43 UTC (rev 967)
+++ trunk/jazz/src/Project.h 2013-03-17 23:18:10 UTC (rev 968)
@@ -112,6 +112,8 @@
// Song path and file name.
void OpenSong(const wxString& SongFileName);
+ void OpenAndReadAsciiMidiFile(const wxString& AsciiMidiFileName);
+
// Description:
// Save a MIDI file. This function will overwrite the file if it
// already exists!
@@ -121,6 +123,8 @@
// MIDI file path and file name.
void ExportMidiFile(const wxString& MidiFileName);
+ void ExportAsciiMidiFile(const wxString& AsciiMidiFileName);
+
// Here is the new play interface. For now it just acts as a layer
// between the Project and the GUI.
// Returns true during playback
Modified: trunk/jazz/src/Track.cpp
===================================================================
--- trunk/jazz/src/Track.cpp 2013-03-17 23:13:43 UTC (rev 967)
+++ trunk/jazz/src/Track.cpp 2013-03-17 23:18:10 UTC (rev 968)
@@ -23,8 +23,8 @@
#include "Track.h"
#include "Configuration.h"
+#include "Dialogs/TrackDialog.h"
#include "DrumUtilities.h"
-#include "Dialogs/TrackDialog.h"
#include "Globals.h"
#include "JazzPlusPlusApplication.h"
#include "Player.h"
@@ -44,7 +44,7 @@
return mMsb.Write(Io) + mLsb.Write(Io) + mDataMsb.Write(Io);
}
-void JZParam::SetCha(unsigned char Channel)
+void JZParam::SetChannel(unsigned char Channel)
{
mMsb.SetChannel(Channel);
mLsb.SetChannel(Channel);
@@ -68,7 +68,7 @@
unsigned char *data)
{
int length = 9 + datalen;
- unsigned char *mess = new unsigned char[length];
+ unsigned char* mess = new unsigned char[length];
mess[0] = 0x41;
mess[1] = 0x10;
mess[2] = 0x42;
@@ -185,15 +185,15 @@
String = Oss.str();
}
-JZMtcOffsetEvent *JZMtcTime::ToOffset()
+JZMtcOffsetEvent* JZMtcTime::ToOffset()
{
- unsigned char *mess = new unsigned char[5];
+ unsigned char* mess = new unsigned char[5];
mess[0] = (unsigned char) hour | ((unsigned char) type << 5);
mess[1] = (unsigned char) min;
mess[2] = (unsigned char) sec;
mess[3] = (unsigned char) fm;
mess[4] = 0x00;
- JZMtcOffsetEvent *s = new JZMtcOffsetEvent(0, mess, 5);
+ JZMtcOffsetEvent* s = new JZMtcOffsetEvent(0, mess, 5);
delete mess;
return s;
}
@@ -205,7 +205,7 @@
return msec;
}
-JZDrumInstrumentParameter::JZDrumInstrumentParameter(JZNrpn *par)
+JZDrumInstrumentParameter::JZDrumInstrumentParameter(JZNrpn* par)
: mPitch(par->mLsb.GetControlValue()),
mpNext(0)
{
@@ -216,18 +216,18 @@
param[drumParam2Index(par->mMsb.GetControlValue())] = par;
}
-JZNrpn *JZDrumInstrumentParameter::Get(int index)
+JZNrpn* JZDrumInstrumentParameter::Get(int index)
{
assert((index >= drumPitchIndex) && (index < numDrumParameters));
return(param[index]);
}
-void JZDrumInstrumentParameter::Put(JZNrpn *par)
+void JZDrumInstrumentParameter::Put(JZNrpn* par)
{
param[par->mLsb.GetControlValue()] = par;
}
-JZDrumInstrumentParameter *JZDrumInstrumentParameter::Next()
+JZDrumInstrumentParameter* JZDrumInstrumentParameter::Next()
{
return mpNext;
}
@@ -237,10 +237,10 @@
return mPitch;
}
-JZDrumInstrumentParameter
-*JZDrumInstrumentParameterList::GetElem(int pit)
+JZDrumInstrumentParameter*
+JZDrumInstrumentParameterList::GetElem(int pit)
{
- JZDrumInstrumentParameter *ptr = list;
+ JZDrumInstrumentParameter* ptr = list;
while (ptr)
{
if (ptr->mPitch == pit)
@@ -252,9 +252,9 @@
return ptr;
}
-JZNrpn *JZDrumInstrumentParameterList::GetParam(int pit, int index)
+JZNrpn* JZDrumInstrumentParameterList::GetParam(int pit, int index)
{
- JZDrumInstrumentParameter *ptr = GetElem(pit);
+ JZDrumInstrumentParameter* ptr = GetElem(pit);
if (ptr)
{
return ptr->Get(index);
@@ -262,7 +262,7 @@
return 0;
}
-void JZDrumInstrumentParameterList::PutParam(JZNrpn *par)
+void JZDrumInstrumentParameterList::PutParam(JZNrpn* par)
{
JZDrumInstrumentParameter* ptr = GetElem(par->mLsb.GetControlValue());
if (!ptr)
@@ -281,7 +281,7 @@
{
if (list)
{
- JZDrumInstrumentParameter *elem = GetElem(pit);
+ JZDrumInstrumentParameter* elem = GetElem(pit);
if (elem)
{
if (elem->Get(index))
@@ -300,8 +300,8 @@
DelParam(pit, i);
}
- JZDrumInstrumentParameter *ptr = list;
- JZDrumInstrumentParameter *prev = 0;
+ JZDrumInstrumentParameter* ptr = list;
+ JZDrumInstrumentParameter* prev = 0;
while (ptr)
{
if (ptr->mPitch == pit)
@@ -322,17 +322,17 @@
}
}
-JZDrumInstrumentParameter *JZDrumInstrumentParameterList::FirstElem()
+JZDrumInstrumentParameter* JZDrumInstrumentParameterList::FirstElem()
{
return list;
}
-JZDrumInstrumentParameter *JZDrumInstrumentParameterList::NextElem(
- JZDrumInstrumentParameter *cur)
+JZDrumInstrumentParameter* JZDrumInstrumentParameterList::NextElem(
+ JZDrumInstrumentParameter* cur)
{
if (cur)
{
- JZDrumInstrumentParameter *ptr = GetElem(cur->mPitch);
+ JZDrumInstrumentParameter* ptr = GetElem(cur->mPitch);
if (ptr)
{
return ptr->mpNext;
@@ -350,7 +350,7 @@
void JZDrumInstrumentParameterList::Clear()
{
- JZDrumInstrumentParameter *ptr = list;
+ JZDrumInstrumentParameter* ptr = list;
while (ptr)
{
list = ptr->mpNext;
@@ -655,17 +655,17 @@
-static int compare(const void *p1, const void *p2)
+static int compare(const void* p1, const void* p2)
{
- JZEvent *e1 = *(JZEvent **)p1;
- JZEvent *e2 = *(JZEvent **)p2;
+ JZEvent* e1 = *(JZEvent **)p1;
+ JZEvent* e2 = *(JZEvent **)p2;
return e1->Compare(*e2);
}
void JZSimpleEventArray::Sort()
{
- qsort(mppEvents, nEvents, sizeof(JZEvent *), compare);
+ qsort(mppEvents, nEvents, sizeof(JZEvent*), compare);
}
@@ -1157,7 +1157,7 @@
// kill all KeyOn's with non matching KeyOff's
for (i = 0; i < nEvents; i++)
{
- JZKeyOnEvent *k = mppEvents[i]->IsKeyOn();
+ JZKeyOnEvent* k = mppEvents[i]->IsKeyOn();
if (k && k->Length <= 0)
{
k->Kill();
@@ -1286,7 +1286,7 @@
BendPitchSens->Write(Io);
}
- JZDrumInstrumentParameter *dpar = DrumParams.FirstElem();
+ JZDrumInstrumentParameter* dpar = DrumParams.FirstElem();
while (dpar)
{
int index;
@@ -1630,7 +1630,7 @@
class JZTrackDlg : public wxForm
{
JZTrackWindow* TrackWin;
- JZTrack *trk;
+ JZTrack* trk;
std::string& mTrackName;
JZNamedChoice PatchChoice;
JZNamedChoice DeviceChoice;
@@ -1641,15 +1641,15 @@
int AudioMode;
public:
- JZTrackDlg::JZTrackDlg(JZTrackWindow *w, JZTrack *t);
- void EditForm(wxPanel *panel);
+ JZTrackDlg::JZTrackDlg(JZTrackWindow* w, JZTrack* t);
+ void EditForm(wxPanel* panel);
virtual void OnOk();
virtual void OnCancel();
virtual void OnHelp();
};
-JZTrackDlg::JZTrackDlg(JZTrackWindow *w, JZTrack *t)
+JZTrackDlg::JZTrackDlg(JZTrackWindow* w, JZTrack* t)
: wxForm(USED_WXFORM_BUTTONS),
PatchChoice(
"Patch",
@@ -1698,7 +1698,7 @@
trk->SetDevice(Device);
if (trk->ForceChannel)
{
- JZChannelEvent *c;
+ JZChannelEvent* c;
JZSysExEvent* s;
JZEventIterator Iterator(trk);
trk->Sort();
@@ -1707,7 +1707,7 @@
{
if ((c = pEvent->IsChannelEvent()) != 0)
{
- c = (JZChannelEvent *)pEvent->Copy();
+ c = (JZChannelEvent*)pEvent->Copy();
c->SetChannel(trk->Channel - 1);
trk->Kill(pEvent);
trk->Put(c);
@@ -1728,7 +1728,7 @@
*pChannel |= sysex_channel(trk->Channel);
}
- s = (JZSysExEvent *) pEvent->Copy();
+ s = (JZSysExEvent*) pEvent->Copy();
trk->Kill(pEvent);
trk->Put(s);
}
@@ -1738,39 +1738,39 @@
if (trk->VibRate)
{
- trk->VibRate->SetCha(trk->Channel - 1);
+ trk->VibRate->SetChannel(trk->Channel - 1);
}
if (trk->VibDepth)
{
- trk->VibDepth->SetCha(trk->Channel - 1);
+ trk->VibDepth->SetChannel(trk->Channel - 1);
}
if (trk->VibDelay)
{
- trk->VibDelay->SetCha(trk->Channel - 1);
+ trk->VibDelay->SetChannel(trk->Channel - 1);
}
if (trk->Cutoff)
{
- trk->Cutoff->SetCha(trk->Channel - 1);
+ trk->Cutoff->SetChannel(trk->Channel - 1);
}
if (trk->Resonance)
{
- trk->Resonance->SetCha(trk->Channel - 1);
+ trk->Resonance->SetChannel(trk->Channel - 1);
}
if (trk->EnvAttack)
{
- trk->EnvAttack->SetCha(trk->Channel - 1);
+ trk->EnvAttack->SetChannel(trk->Channel - 1);
}
if (trk->EnvDecay)
{
- trk->EnvDecay->SetCha(trk->Channel - 1);
+ trk->EnvDecay->SetChannel(trk->Channel - 1);
}
if (trk->EnvRelease)
{
- trk->EnvRelease->SetCha(trk->Channel - 1);
+ trk->EnvRelease->SetChannel(trk->Channel - 1);
}
if (trk->BendPitchSens)
{
- trk->BendPitchSens->SetCha(trk->Channel - 1);
+ trk->BendPitchSens->SetChannel(trk->Channel - 1);
}
if (trk->mpBank)
{
@@ -1782,14 +1782,14 @@
}
if (!trk->DrumParams.IsEmpty())
{
- JZDrumInstrumentParameter *dpar = trk->DrumParams.FirstElem();
+ JZDrumInstrumentParameter* dpar = trk->DrumParams.FirstElem();
while (dpar)
{
for (int index = drumPitchIndex; index < numDrumParameters; ++index)
{
if (dpar->Get(index))
{
- dpar->Get(index)->SetCha(trk->Channel - 1);
+ dpar->Get(index)->SetChannel(trk->Channel - 1);
}
}
dpar = trk->DrumParams.NextElem(dpar);
@@ -1801,7 +1801,7 @@
wxForm::OnOk();
}
-void JZTrackDlg::EditForm(wxPanel *panel)
+void JZTrackDlg::EditForm(wxPanel* panel)
{
PatchNr = trk->GetPatch() + (trk->GetBank() << 8);
Device = trk->GetDevice();
@@ -1911,7 +1911,7 @@
return Channel == gpConfig->GetValue(C_DrumChannel);
}
-void JZTrack::Merge(JZEventArray *t)
+void JZTrack::Merge(JZEventArray* t)
{
for (int i = 0; i < t->nEvents; i++)
{
@@ -1976,7 +1976,7 @@
{
if (mUndoCount > 0)
{
- JZUndoBuffer *undo = &mUndoBuffers[mUndoIndex];
+ JZUndoBuffer* undo = &mUndoBuffers[mUndoIndex];
for (int i = undo->nEvents - 1; i >= 0; i--)
{
JZEvent* pEvent = undo->mppEvents[i];
@@ -2006,7 +2006,7 @@
{
mUndoIndex = (mUndoIndex + 1) % MaxUndo;
- JZUndoBuffer *undo = &mUndoBuffers[mUndoIndex];
+ JZUndoBuffer* undo = &mUndoBuffers[mUndoIndex];
for (int i = 0; i < undo->nEvents; i++)
{
JZEvent* pEvent = undo->mppEvents[i];
@@ -2060,14 +2060,14 @@
{
if (mpCopyright)
{
- return (const char *)mpCopyright->GetData();
+ return (const char*)mpCopyright->GetData();
}
return "";
}
-void JZTrack::SetCopyright(char *str)
+void JZTrack::SetCopyright(char* str)
{
if (mpCopyright)
{
@@ -2080,7 +2080,7 @@
{
len = strlen(str);
}
- Put(new JZCopyrightEvent(0, (unsigned char *)str, len));
+ Put(new JZCopyrightEvent(0, (unsigned char*)str, len));
}
Cleanup();
}
@@ -2106,7 +2106,7 @@
{
Put(new JZTrackNameEvent(
0,
- (unsigned char *)pTrackName,
+ (unsigned char*)pTrackName,
strlen(pTrackName)));
}
Cleanup();
@@ -2608,7 +2608,7 @@
{
if (!DrumParams.IsEmpty())
{
- JZNrpn *par = DrumParams.GetParam(pitch, index);
+ JZNrpn* par = DrumParams.GetParam(pitch, index);
if (par)
{
return(par->GetVal() + 1);
@@ -2761,7 +2761,7 @@
if (pValue)
{
- return *pValue + 1;
+ return* pValue + 1;
}
return 0;
@@ -2955,7 +2955,7 @@
int JZTrack::GetChorusType(int lsb)
{
- const unsigned char *pValue = gpSynth->GetSysexValPtr(ChorusType);
+ const unsigned char* pValue = gpSynth->GetSysexValPtr(ChorusType);
if (pValue)
{
@@ -3112,7 +3112,7 @@
return 0;
}
-void JZTrack::SetPartRsrv(unsigned char *rsrv)
+void JZTrack::SetPartRsrv(unsigned char* rsrv)
{
if (PartialReserve)
{
@@ -3318,7 +3318,7 @@
Cleanup();
}
-JZSetTempoEvent *JZTrack::GetCurrentTempo(int clk)
+JZSetTempoEvent* JZTrack::GetCurrentTempo(int clk)
{
JZEventIterator Iterator(this);
Sort();
@@ -3338,7 +3338,7 @@
int JZTrack::GetCurrentSpeed(int clk)
{
- JZSetTempoEvent *t = GetCurrentTempo(clk);
+ JZSetTempoEvent* t = GetCurrentTempo(clk);
if (t)
{
return t->GetBPM();
Modified: trunk/jazz/src/Track.h
===================================================================
--- trunk/jazz/src/Track.h 2013-03-17 23:13:43 UTC (rev 967)
+++ trunk/jazz/src/Track.h 2013-03-17 23:18:10 UTC (rev 968)
@@ -79,18 +79,18 @@
public:
JZParam(
- int clk,
- int cha,
+ int Clock,
+ int Channel,
unsigned char id1,
unsigned char msb,
unsigned char id2,
unsigned char lsb,
unsigned char msbval)
- : mMsb(clk, cha, id1, msb),
- mLsb(clk, cha, id2, lsb),
- mDataMsb(clk, cha, 0x06, msbval),
- mResetMsb(clk, cha, id1, 0x7f),
- mResetLsb(clk, cha, id2, 0x7f)
+ : mMsb(Clock, Channel, id1, msb),
+ mLsb(Clock, Channel, id2, lsb),
+ mDataMsb(Clock, Channel, 0x06, msbval),
+ mResetMsb(Clock, Channel, id1, 0x7f),
+ mResetLsb(Clock, Channel, id2, 0x7f)
{
}
@@ -100,7 +100,7 @@
virtual int Write(JZWriteBase& Io);
- virtual void SetCha(unsigned char cha);
+ virtual void SetChannel(unsigned char Channel);
virtual int GetVal()
{
@@ -121,12 +121,12 @@
public:
JZNrpn(
- int clk,
- int cha,
+ int Clock,
+ int Channel,
unsigned char msb,
unsigned char lsb,
unsigned char msbval)
- : JZParam(clk, cha, 0x63, msb, 0x62, lsb, msbval)
+ : JZParam(Clock, Channel, 0x63, msb, 0x62, lsb, msbval)
{
}
};
@@ -138,12 +138,12 @@
public:
JZRpn(
- int clk,
- int cha,
+ int Clock,
+ int Channel,
unsigned char msb,
unsigned char lsb,
unsigned char msbval)
- : JZParam(clk, cha, 0x65, msb, 0x64, lsb, msbval)
+ : JZParam(Clock, Channel, 0x65, msb, 0x64, lsb, msbval)
{
}
};
@@ -386,7 +386,7 @@
void GrabData(JZSimpleEventArray &src);
- void Copy(JZSimpleEventArray& src, int frclk, int toclk);
+ void Copy(JZSimpleEventArray& src, int frClock, int toClock);
JZSimpleEventArray();
@@ -692,9 +692,9 @@
int GetDefaultSpeed(); // beats per minute
void SetDefaultSpeed(int bpm);
- int GetCurrentSpeed( int clk ); // beats per minute
+ int GetCurrentSpeed(int Clock); // beats per minute
- JZSetTempoEvent *GetCurrentTempo( int clk );
+ JZSetTempoEvent* GetCurrentTempo(int Clock);
int GetMasterVol();
void SetMasterVol(int MasterVol);
Modified: trunk/jazz/src/TrackFrame.cpp
===================================================================
--- trunk/jazz/src/TrackFrame.cpp 2013-03-17 23:13:43 UTC (rev 967)
+++ trunk/jazz/src/TrackFrame.cpp 2013-03-17 23:18:10 UTC (rev 968)
@@ -22,20 +22,21 @@
#include "TrackFrame.h"
+#include "AboutDialog.h"
+#include "Configuration.h"
+#include "Dialogs/MetronomeSettingsDialog.h"
+#include "Dialogs/SynthesizerSettingsDialog.h"
+#include "Globals.h"
+#include "Harmony.h"
#include "JazzPlusPlusApplication.h"
#include "Player.h"
#include "Project.h"
#include "ProjectManager.h"
+#include "RecordingInfo.h"
#include "Resources.h"
-#include "RecordingInfo.h"
+#include "Rhythm.h"
#include "TrackWindow.h"
#include "ToolBar.h"
-#include "Globals.h"
-#include "Configuration.h"
-#include "Harmony.h"
-#include "Dialogs/MetronomeSettingsDialog.h"
-#include "Dialogs/SynthesizerSettingsDialog.h"
-#include "AboutDialog.h"
#ifdef __WXMSW__
#include "mswin/WindowsPlayer.h"
@@ -89,8 +90,12 @@
EVT_MENU(ID_IMPORT_MIDI, JZTrackFrame::OnFileImportMidi)
+ EVT_MENU(ID_IMPORT_ASCII_MIDI, JZTrackFrame::OnFileImportAscii)
+
EVT_MENU(ID_EXPORT_MIDI, JZTrackFrame::OnFileExportMidi)
+ EVT_MENU(ID_EXPORT_ASCII_MIDI, JZTrackFrame::OnFileExportAscii)
+
EVT_MENU(
ID_EXPORT_SELECTION_AS_MIDI,
JZTrackFrame::OnFileExportSelectionAsMidi)
@@ -113,6 +118,8 @@
EVT_MENU(ID_TOOLS_HARMONY_BROWSER, JZTrackFrame::OnToolsHarmonyBrowser)
+ EVT_MENU(ID_TOOLS_RHYTHM_GENERATOR, JZTrackFrame::OnToolsRhythmGenerator)
+
EVT_MENU(ID_SETTINGS_METRONOME, JZTrackFrame::OnSettingsMetronome)
EVT_MENU(ID_SETTINGS_SYNTHESIZER, JZTrackFrame::OnSettingsSynthesizerType)
@@ -238,8 +245,9 @@
mpFileMenu->AppendSeparator();
mpFileMenu->Append(ID_IMPORT_MIDI, "Import MIDI...");
-
+//DEBUG mpFileMenu->Append(ID_IMPORT_ASCII_MIDI, "Import ASCII...");
mpFileMenu->Append(ID_EXPORT_MIDI, "Export as MIDI...");
+//DEBUG mpFileMenu->Append(ID_EXPORT_ASCII_MIDI, "Export as ASCII...");
mpFileMenu->Append(
ID_EXPORT_SELECTION_AS_MIDI,
"Export Selection as MIDI...");
@@ -309,7 +317,8 @@
pMiscMenu->Append(ID_MISC_SET_COPYRIGHT, "&Set Music Copyright...");
mpToolsMenu = new wxMenu;
- mpToolsMenu->Append(ID_TOOLS_HARMONY_BROWSER, "&Harmony Browser...");
+ mpToolsMenu->Append(ID_TOOLS_HARMONY_BROWSER, "&Harmony Browser...");
+ mpToolsMenu->Append(ID_TOOLS_RHYTHM_GENERATOR, "&Rhythm Generator...");
#if 0
// Move to Project Menu
@@ -468,6 +477,7 @@
// }
delete gpHarmonyBrowser;
+ delete gpRhythmGeneratorFrame;
return true;
}
@@ -557,6 +567,27 @@
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
+void JZTrackFrame::OnFileImportAscii(wxCommandEvent&)
+{
+ wxFileDialog OpenDialog(
+ 0,
+ "Load ASCII File",
+ "",
+ "",
+ "ASCII MIDI files (txt)|*.txt|All files (*.*)|*.*",
+ wxFD_OPEN | wxFD_CHANGE_DIR);
+ if (OpenDialog.ShowModal() == wxID_OK)
+ {
+ wxString AsciiMidiFileName = OpenDialog.GetPath();
+ gpProject->OpenAndReadAsciiMidiFile(AsciiMidiFileName);
+ SetTitle(AsciiMidiFileName);
+ mpTrackWindow->SetScrollRanges();
+ mpTrackWindow->Refresh(false);
+ }
+}
+
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
void JZTrackFrame::OnFileExportMidi(wxCommandEvent& Event)
{
// wxFD_OVERWRITE_PROMPT - For save dialog only: prompt for a confirmation
@@ -578,6 +609,27 @@
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
+void JZTrackFrame::OnFileExportAscii(wxCommandEvent&)
+{
+ // wxFD_OVERWRITE_PROMPT - For save dialog only: prompt for a confirmation
+ // if a file will be overwritten.
+ wxFileDialog SaveAsDialog(
+ 0,
+ "Save MIDI File as ASCII",
+ "",
+ "",
+ "ASCII MIDI files (txt)|*.txt|All files (*.*)|*.*",
+ wxFD_SAVE | wxFD_OVERWRITE_PROMPT);
+ if (SaveAsDialog.ShowModal() == wxID_OK)
+ {
+ wxString FileName = SaveAsDialog.GetPath();
+ gpProject->ExportAsciiMidiFile(FileName);
+ SetTitle(FileName);
+ }
+}
+
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
void JZTrackFrame::OnFileExportSelectionAsMidi(wxCommandEvent& Event)
{
}
@@ -654,6 +706,13 @@
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
+void JZTrackFrame::OnToolsRhythmGenerator(wxCommandEvent& Event)
+{
+ CreateRhythmGenerator();
+}
+
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
void JZTrackFrame::OnSettingsMetronome(wxCommandEvent& Event)
{
JZMetronomeInfo MetronomeInfo = gpProject->GetMetronomeInfo();
Modified: trunk/jazz/src/TrackFrame.h
===================================================================
--- trunk/jazz/src/TrackFrame.h 2013-03-17 23:13:43 UTC (rev 967)
+++ trunk/jazz/src/TrackFrame.h 2013-03-17 23:18:10 UTC (rev 968)
@@ -81,8 +81,12 @@
void OnFileImportMidi(wxCommandEvent& Event);
+ void OnFileImportAscii(wxCommandEvent& Event);
+
void OnFileExportMidi(wxCommandEvent& Event);
+ void OnFileExportAscii(wxCommandEvent& Event);
+
void OnFileExportSelectionAsMidi(wxCommandEvent& Event);
void OnFileExit(wxCommandEvent& Event);
@@ -101,6 +105,8 @@
void OnToolsHarmonyBrowser(wxCommandEvent& Event);
+ void OnToolsRhythmGenerator(wxCommandEvent& Event);
+
void OnSettingsMetronome(wxCommandEvent& Event);
void OnSettingsSynthesizerType(wxCommandEvent& Event);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pst...@us...> - 2013-03-17 23:13:46
|
Revision: 967
http://sourceforge.net/p/jazzplusplus/code/967
Author: pstieber
Date: 2013-03-17 23:13:43 +0000 (Sun, 17 Mar 2013)
Log Message:
-----------
Started updating and implementing the rhythm generator.
Modified Paths:
--------------
trunk/jazz/src/Globals.cpp
trunk/jazz/src/Globals.h
trunk/jazz/src/Rhythm.cpp
trunk/jazz/src/Rhythm.h
Modified: trunk/jazz/src/Globals.cpp
===================================================================
--- trunk/jazz/src/Globals.cpp 2013-03-17 23:12:01 UTC (rev 966)
+++ trunk/jazz/src/Globals.cpp 2013-03-17 23:13:43 UTC (rev 967)
@@ -65,6 +65,8 @@
JZHarmonyBrowserInterface* gpHarmonyBrowser = 0;
+JZRhythmGeneratorFrame* gpRhythmGeneratorFrame = 0;
+
const double gDegreesToRadians = 0.01745329251994330212;
const double gRadiansToDegrees = 57.2957795130823;
@@ -105,4 +107,3 @@
return TokenIndex;
}
-
Modified: trunk/jazz/src/Globals.h
===================================================================
--- trunk/jazz/src/Globals.h 2013-03-17 23:12:01 UTC (rev 966)
+++ trunk/jazz/src/Globals.h 2013-03-17 23:13:43 UTC (rev 967)
@@ -35,6 +35,7 @@
class JZPlayer;
class JZHelp;
class JZProject;
+class JZRhythmGeneratorFrame;
class JZTrackFrame;
class JZTrackWindow;
class JZHarmonyBrowserInterface;
@@ -62,6 +63,7 @@
extern JZTrackFrame* gpTrackFrame;
extern JZTrackWindow* gpTrackWindow;
extern JZHarmonyBrowserInterface* gpHarmonyBrowser;
+extern JZRhythmGeneratorFrame* gpRhythmGeneratorFrame;
extern const double gDegreesToRadians;
extern const double gRadiansToDegrees;
Modified: trunk/jazz/src/Rhythm.cpp
===================================================================
--- trunk/jazz/src/Rhythm.cpp 2013-03-17 23:12:01 UTC (rev 966)
+++ trunk/jazz/src/Rhythm.cpp 2013-03-17 23:13:43 UTC (rev 967)
@@ -41,6 +41,7 @@
#include <wx/checkbox.h>
#include <wx/choicdlg.h>
#include <wx/listbox.h>
+#include <wx/menu.h>
#include <wx/msgdlg.h>
#include <wx/slider.h>
#include <wx/toolbar.h>
@@ -50,8 +51,6 @@
using namespace std;
-JZRhythmWindow* rhythm_win = 0;
-
void tRhyGroup::write(ostream& Os) const
{
Os << listen << " ";
@@ -1236,7 +1235,6 @@
delete instruments[i];
}
delete mpToolBar;
- rhythm_win = 0;
}
bool JZRhythmWindow::OnClose()
@@ -1298,3 +1296,106 @@
return Is;
}
+//*****************************************************************************
+//*****************************************************************************
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+JZRhythmGeneratorWindow::JZRhythmGeneratorWindow(
+ wxFrame* pParent,
+ const wxPoint& Position,
+ const wxSize& Size)
+ : wxWindow(pParent, wxID_ANY, Position, Size),
+ mRhythm(0),
+ mpLengthEdit(0),
+ mpVelocityEdit(0),
+ mpRhythmEdit(0)
+{
+ int x = 0;
+ int y = 0;
+ int Width, Height;
+ GetClientSize(&Width, &Height);
+
+ mpLengthEdit = new JZArrayEdit(
+ pParent,
+ mRhythm.length,
+ x,
+ y + Height / 2,
+ Width / 2,
+ Height / 4 - 4);
+ mpLengthEdit->SetXMinMax(1, 8);
+ mpLengthEdit->SetLabel("length/interval");
+
+ mpVelocityEdit = new JZArrayEdit(
+ pParent,
+ mRhythm.veloc,
+ x + Width / 2,
+ y + Height / 2,
+ Width / 2,
+ Height / 4 - 4);
+ mpVelocityEdit->SetXMinMax(1, 127);
+ mpVelocityEdit->SetLabel("velocity");
+
+ mpRhythmEdit = new JZRhyArrayEdit(
+ pParent,
+ mRhythm.rhythm,
+ x,
+ y + 3 * Height / 4,
+ Width,
+ Height/ 4 - 4);
+ mpRhythmEdit->SetMeter(
+ mRhythm.steps_per_count,
+ mRhythm.count_per_bar,
+ mRhythm.n_bars);
+ mpRhythmEdit->SetLabel("rhythm");
+}
+
+//*****************************************************************************
+//*****************************************************************************
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+JZRhythmGeneratorFrame::JZRhythmGeneratorFrame()
+ : wxFrame(
+ 0,
+ wxID_ANY,
+ "Rhythm Generator",
+ wxPoint(
+ gpConfig->GetValue(C_RhythmXpos),
+ gpConfig->GetValue(C_RhythmYpos)),
+ wxSize(640, 580)),
+ mpRhythmGeneratorWindow(0)
+{
+ wxMenu* pFileMenu = new wxMenu;
+ pFileMenu->Append(wxID_OPEN, "&Load...");
+ pFileMenu->Append(wxID_SAVEAS, "Save &As...");
+ pFileMenu->Append(wxID_CLOSE, "&Close");
+
+ wxMenuBar* pMenuBar = new wxMenuBar;
+ pMenuBar->Append(pFileMenu, "&File");
+
+ SetMenuBar(pMenuBar);
+
+ int Width, Height;
+ GetClientSize(&Width, &Height);
+ mpRhythmGeneratorWindow =
+ new JZRhythmGeneratorWindow(this, wxPoint(0, 0), wxSize(Width, Height));
+}
+
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+JZRhythmGeneratorFrame::~JZRhythmGeneratorFrame()
+{
+ delete mpRhythmGeneratorWindow;
+
+ gpRhythmGeneratorFrame = 0;
+}
+
+//*****************************************************************************
+//*****************************************************************************
+void CreateRhythmGenerator()
+{
+ if (!gpRhythmGeneratorFrame)
+ {
+ gpRhythmGeneratorFrame = new JZRhythmGeneratorFrame();
+ }
+ ((JZRhythmGeneratorFrame*)gpRhythmGeneratorFrame)->Show(true);
+}
Modified: trunk/jazz/src/Rhythm.h
===================================================================
--- trunk/jazz/src/Rhythm.h 2013-03-17 23:12:01 UTC (rev 966)
+++ trunk/jazz/src/Rhythm.h 2013-03-17 23:13:43 UTC (rev 967)
@@ -22,6 +22,7 @@
#pragma once
+#include "Globals.h"
#include "Random.h"
#include "ToolBar.h"
@@ -30,10 +31,10 @@
#include <iostream>
-class JZTrack;
+class JZBarInfo;
class JZEventWindow;
class JZSong;
-class JZBarInfo;
+class JZTrack;
class wxButton;
class wxCheckBox;
class wxListBox;
@@ -75,6 +76,7 @@
class JZRhythm
{
friend class JZRhythmWindow;
+ friend class JZRhythmGeneratorWindow;
private:
@@ -176,20 +178,20 @@
friend std::ostream& operator << (std::ostream& os, JZRhythmWindow const& a);
friend std::istream& operator >> (std::istream& Is, JZRhythmWindow& a);
- wxPanel *inst_panel;
+ wxPanel* inst_panel;
#ifdef OBSOLETE
wxText *label;
#endif
- wxSlider *steps_per_count;
- wxSlider *count_per_bar;
- wxSlider *n_bars;
- wxListBox *instrument_list;
- wxCheckBox *rand_checkbox;
+ wxSlider* steps_per_count;
+ wxSlider* count_per_bar;
+ wxSlider* n_bars;
+ wxListBox* instrument_list;
+ wxCheckBox* rand_checkbox;
- wxPanel *group_panel;
- wxListBox *group_list;
- wxSlider *group_contrib;
- wxSlider *group_listen;
+ wxPanel* group_panel;
+ wxListBox* group_list;
+ wxSlider* group_contrib;
+ wxSlider* group_listen;
int act_group;
JZArrayEdit *length_edit;
@@ -240,7 +242,41 @@
void UpInstrument();
void DownInstrument();
void InitInstrumentList();
+};
+//*****************************************************************************
+//*****************************************************************************
+class JZRhythmGeneratorWindow : public wxWindow
+{
+ public:
+
+ JZRhythmGeneratorWindow(
+ wxFrame* pParent,
+ const wxPoint& Position,
+ const wxSize& Size);
+
+ private:
+
+ JZRhythm mRhythm;
+
+ JZArrayEdit* mpLengthEdit;
+ JZArrayEdit* mpVelocityEdit;
+ JZRhyArrayEdit* mpRhythmEdit;
};
-extern JZRhythmWindow *rhythm_win;
+//*****************************************************************************
+//*****************************************************************************
+class JZRhythmGeneratorFrame : public wxFrame
+{
+ public:
+
+ JZRhythmGeneratorFrame();
+
+ ~JZRhythmGeneratorFrame();
+
+ private:
+
+ JZRhythmGeneratorWindow* mpRhythmGeneratorWindow;
+};
+
+extern void CreateRhythmGenerator();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pst...@us...> - 2013-03-17 23:12:02
|
Revision: 966
http://sourceforge.net/p/jazzplusplus/code/966
Author: pstieber
Date: 2013-03-17 23:12:01 +0000 (Sun, 17 Mar 2013)
Log Message:
-----------
1. Updated include files.
2. Updated to use std::string for file names.
3. Updated to use C++ stream instead of C-style I/O.
Modified Paths:
--------------
trunk/jazz/src/StandardFile.cpp
trunk/jazz/src/StandardFile.h
Modified: trunk/jazz/src/StandardFile.cpp
===================================================================
--- trunk/jazz/src/StandardFile.cpp 2013-03-17 23:07:39 UTC (rev 965)
+++ trunk/jazz/src/StandardFile.cpp 2013-03-17 23:12:01 UTC (rev 966)
@@ -25,11 +25,10 @@
#include "ErrorMessage.h"
#include <cassert>
-#include <cstdio>
#include <cstdlib>
-#include <cstdarg>
+#include <cstring>
+#include <iostream>
#include <sstream>
-#include <string.h>
using namespace std;
@@ -85,9 +84,9 @@
int IsEof(); // Only after Load, Save never has Eof.
- void Load(FILE* fd);
+ void Load(std::istream& Is);
- void Save(FILE* fd); // Depends on EndOfTrack
+ void Save(std::ostream& Os); // Depends on EndOfTrack
void Put(JZEvent* pEvent, unsigned char* pData, int Length);
@@ -98,17 +97,17 @@
private:
- long Size; // Size of base
- long nRead; // Number of bytes read from the file
+ int Size; // Size of base
+ int nRead; // Number of bytes read from the file
unsigned char* mpBase; // Buffer for data.
unsigned char* cp; // Aktueller Schreib/Lese pointer
- long Clock; // Absolute Clock
+ int Clock; // Absolute Clock
int EofSeen; // endoftrack meta-event read
int RunningStatus;
void Resize(int SizeNeeded);
- void PutVar(unsigned long val);
- unsigned long GetVar();
+ void PutVar(unsigned int val);
+ unsigned int GetVar();
};
//*****************************************************************************
@@ -147,8 +146,8 @@
inline
void JZStandardChunk::Resize(int Needed)
{
- long Used = cp - mpBase;
- long i, n = Size;
+ int Used = cp - mpBase;
+ int i, n = Size;
if (Size - Used < Needed)
{
do
@@ -177,9 +176,9 @@
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-void JZStandardChunk::PutVar(unsigned long val)
+void JZStandardChunk::PutVar(unsigned int val)
{
- unsigned long buf;
+ unsigned int buf;
buf = val & 0x7f;
while ((val >>= 7) > 0)
{
@@ -200,9 +199,9 @@
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-unsigned long JZStandardChunk::GetVar()
+unsigned int JZStandardChunk::GetVar()
{
- unsigned long val;
+ unsigned int val;
char c;
if ((val = *cp++) & 0x80)
{
@@ -219,7 +218,7 @@
void JZStandardChunk::Put(JZEvent* pEvent, unsigned char* Data, int Length)
{
unsigned char Stat;
- long dif;
+ int dif;
Resize(Length + 20);
dif = pEvent->GetClock() - Clock;
@@ -302,9 +301,9 @@
}
break;
- /*
- * Meta-Events
- */
+ //
+ // Meta-Events
+ //
case StatText:
case StatTrackName:
@@ -315,7 +314,7 @@
case StatKeySignat:
case StatMtcOffset:
- default: /* hopefully */
+ default: // hopefully
#if 0
if (1)
@@ -446,7 +445,7 @@
RunningStatus = 0;
return pEvent;
- default: // Text und andere ignorieren
+ default: // Text and ignore others
len = GetVar();
pEvent = new JZMetaEvent(Clock, Stat, cp, len);
cp += len;
@@ -456,7 +455,7 @@
default:
- if (cp[0] & 0x80) // neuer Running Status?
+ if (cp[0] & 0x80) // new Running Status?
RunningStatus = *cp++;
Stat = RunningStatus & 0xF0;
Channel = RunningStatus & 0x0F;
@@ -516,22 +515,22 @@
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-void JZStandardChunk::Load(FILE* pFd)
+void JZStandardChunk::Load(istream& Is)
{
char Type[4];
int Size;
- fread(Type, 4, 1, pFd);
- fread(&Size, 4, 1, pFd);
+ Is.read(Type, 4);
+ Is.read((char*)&Size, sizeof(Size));
SwapL(&Size);
Resize(Size);
- fread(mpBase, Size, 1, pFd);
+ Is.read((char*)mpBase, Size);
nRead = Size;
}
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-void JZStandardChunk::Save(FILE* pFd)
+void JZStandardChunk::Save(ostream& Os)
{
int Size, hSize;
@@ -540,11 +539,11 @@
*cp++ = 0xff;
*cp++ = 0x2f;
*cp++ = 0x00;
- fwrite("MTrk", 4, 1, pFd);
+ Os.write("MTrk", 4);
Size = hSize = cp - mpBase;
SwapL(&hSize);
- fwrite(&hSize, 4, 1, pFd);
- fwrite(mpBase, Size, 1, pFd);
+ Os.write((char*)&hSize, sizeof(hSize));
+ Os.write((char*)mpBase, Size);
}
//*****************************************************************************
@@ -589,22 +588,22 @@
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-int JZStandardRead::Open(const char* pFileName)
+int JZStandardRead::Open(const string& FileName)
{
JZFileHeader FileHeader;
int hSize;
int i;
char Type[4];
- if (!JZReadBase::Open(pFileName))
+ if (!JZReadBase::Open(FileName))
{
ostringstream Oss;
- Oss << "Can't open " << pFileName;
+ Oss << "Can't open " << FileName;
Error(Oss.str());
return 0;
}
- fread(Type, 4, 1, mpFd);
+ mIfs.read(Type, 4);
if (strncmp("MThd", Type, 4) != 0)
{
@@ -612,11 +611,11 @@
return 0;
}
- fread(&hSize, 4, 1, mpFd);
+ mIfs.read((char*)&hSize, 4);
SwapL(&hSize);
assert (hSize == sizeof(FileHeader));
- fread(&FileHeader, 6, 1, mpFd);
+ mIfs.read((char*)&FileHeader, 6);
FileHeader.Swap();
mTrackCount = FileHeader.mTrackCount;
mTicksPerQuarter = FileHeader.Unit;
@@ -624,7 +623,7 @@
mpTracks = new JZStandardChunk [mTrackCount];
for (i = 0; i < mTrackCount; i++)
{
- mpTracks[i].Load(mpFd);
+ mpTracks[i].Load(mIfs);
}
mTrackIndex = -1;
@@ -678,11 +677,11 @@
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
int JZStandardWrite::Open(
- const char* pFileName,
+ const string& FileName,
int TrackCount,
int TicksPerQuarter)
{
- if (!JZWriteBase::Open(pFileName, TrackCount, TicksPerQuarter))
+ if (!JZWriteBase::Open(FileName, TrackCount, TicksPerQuarter))
{
return 0;
}
@@ -698,23 +697,22 @@
//-----------------------------------------------------------------------------
void JZStandardWrite::Close()
{
- long Size;
- JZFileHeader FileHeader;
- int i;
+ mOfs.write("MThd", 4);
- fwrite("MThd", 4, 1, mpFd);
- Size = 6;
+ int Size = 6;
SwapL(&Size);
- fwrite(&Size, 4, 1, mpFd);
+ mOfs.write((char*)&Size, sizeof(Size));
+
+ JZFileHeader FileHeader;
FileHeader.Unit = mTicksPerQuarter;
FileHeader.Format = 1;
FileHeader.mTrackCount = mTrackCount;
FileHeader.Swap();
- fwrite(&FileHeader, 6, 1, mpFd);
+ mOfs.write((char*) &FileHeader, sizeof(FileHeader));
- for (i = 0; i < mTrackCount; i++)
+ for (int i = 0; i < mTrackCount; ++i)
{
- mpTracks[i].Save(mpFd);
+ mpTracks[i].Save(mOfs);
}
JZWriteBase::Close();
Modified: trunk/jazz/src/StandardFile.h
===================================================================
--- trunk/jazz/src/StandardFile.h 2013-03-17 23:07:39 UTC (rev 965)
+++ trunk/jazz/src/StandardFile.h 2013-03-17 23:12:01 UTC (rev 966)
@@ -24,8 +24,6 @@
#include "Events.h"
-#include <stdio.h>
-
class JZEvent;
class JZStandardChunk;
@@ -39,7 +37,7 @@
virtual ~JZStandardRead();
- virtual int Open(const char* pFileName);
+ virtual int Open(const std::string& FileName);
virtual void Close();
@@ -65,7 +63,7 @@
virtual ~JZStandardWrite();
virtual int Open(
- const char* pFileName,
+ const std::string& FileName,
int TrackCount,
int TicksPerQuarter);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pst...@us...> - 2013-03-17 23:07:42
|
Revision: 965
http://sourceforge.net/p/jazzplusplus/code/965
Author: pstieber
Date: 2013-03-17 23:07:39 +0000 (Sun, 17 Mar 2013)
Log Message:
-----------
Updated to use std::string for file names.
Modified Paths:
--------------
trunk/jazz/src/Song.cpp
trunk/jazz/src/Song.h
Modified: trunk/jazz/src/Song.cpp
===================================================================
--- trunk/jazz/src/Song.cpp 2013-03-17 23:06:42 UTC (rev 964)
+++ trunk/jazz/src/Song.cpp 2013-03-17 23:07:39 UTC (rev 965)
@@ -170,7 +170,7 @@
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-void JZSong::Read(JZReadBase& Io, const char* pFileName)
+void JZSong::Read(JZReadBase& Io, const string& FileName)
{
int i;
wxBeginBusyCursor();
@@ -178,7 +178,7 @@
{
mTracks[i].Clear();
}
- int n = Io.Open(pFileName);
+ int n = Io.Open(FileName);
for (i = 0; i < n && i < eMaxTrackCount; ++i)
{
mTracks[i].Read(Io);
@@ -207,7 +207,7 @@
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-void JZSong::Write(JZWriteBase& Io, const char* pFileName)
+void JZSong::Write(JZWriteBase& Io, const string& FileName)
{
// Make sure track 0 has a synth reset
if (!mTracks[0].mpReset)
@@ -217,7 +217,7 @@
}
int n = NumUsedTracks();
- if (!Io.Open(pFileName, n, mTicksPerQuarter))
+ if (!Io.Open(FileName, n, mTicksPerQuarter))
{
return;
}
Modified: trunk/jazz/src/Song.h
===================================================================
--- trunk/jazz/src/Song.h 2013-03-17 23:06:42 UTC (rev 964)
+++ trunk/jazz/src/Song.h 2013-03-17 23:07:39 UTC (rev 965)
@@ -94,9 +94,9 @@
void Clear();
- void Read(JZReadBase& Io, const char* pFileName = 0);
+ void Read(JZReadBase& Io, const std::string& FileName);
- void Write(JZWriteBase& Io, const char* pFileName = 0);
+ void Write(JZWriteBase& Io, const std::string& FileName);
JZTrack* GetTrack(int TrackIndex);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pst...@us...> - 2013-03-17 23:06:44
|
Revision: 964
http://sourceforge.net/p/jazzplusplus/code/964
Author: pstieber
Date: 2013-03-17 23:06:42 +0000 (Sun, 17 Mar 2013)
Log Message:
-----------
Added resource IDs for importing and exporting MIDI events in ASCII files and
rhythm generator creation.
Modified Paths:
--------------
trunk/jazz/src/Resources.h
Modified: trunk/jazz/src/Resources.h
===================================================================
--- trunk/jazz/src/Resources.h 2013-03-17 23:04:53 UTC (rev 963)
+++ trunk/jazz/src/Resources.h 2013-03-17 23:06:42 UTC (rev 964)
@@ -32,8 +32,10 @@
#define ID_FILE_REVERT_TO_SAVED (wxID_HIGHEST + 1)
#define ID_IMPORT_MIDI (wxID_HIGHEST + 2)
-#define ID_EXPORT_MIDI (wxID_HIGHEST + 3)
-#define ID_EXPORT_SELECTION_AS_MIDI (wxID_HIGHEST + 4)
+#define ID_IMPORT_ASCII_MIDI (wxID_HIGHEST + 3)
+#define ID_EXPORT_MIDI (wxID_HIGHEST + 4)
+#define ID_EXPORT_ASCII_MIDI (wxID_HIGHEST + 5)
+#define ID_EXPORT_SELECTION_AS_MIDI (wxID_HIGHEST + 6)
#define ID_SETTINGS_METRONOME (wxID_HIGHEST + 10)
#define ID_SETTINGS_SYNTHESIZER (wxID_HIGHEST + 11)
@@ -106,6 +108,7 @@
#define ID_SHOW_ALL_EVENTS_FROM_ALL_TRACKS (wxID_HIGHEST + 93)
#define ID_TOOLS_HARMONY_BROWSER (wxID_HIGHEST + 95)
+#define ID_TOOLS_RHYTHM_GENERATOR (wxID_HIGHEST + 96)
#define ID_HELP_PIANO_WINDOW (wxID_HIGHEST + 100)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pst...@us...> - 2013-03-17 23:04:55
|
Revision: 963
http://sourceforge.net/p/jazzplusplus/code/963
Author: pstieber
Date: 2013-03-17 23:04:53 +0000 (Sun, 17 Mar 2013)
Log Message:
-----------
1. Updated to use std::string for file names.
2. Updated to use C++ streams instead of C-style I/O.
Modified Paths:
--------------
trunk/jazz/src/Events.cpp
trunk/jazz/src/Events.h
Modified: trunk/jazz/src/Events.cpp
===================================================================
--- trunk/jazz/src/Events.cpp 2013-03-17 23:02:54 UTC (rev 962)
+++ trunk/jazz/src/Events.cpp 2013-03-17 23:04:53 UTC (rev 963)
@@ -27,10 +27,6 @@
#include "JazzPlusPlusApplication.h"
#include "Synth.h"
-#include <cassert>
-#include <cstdarg>
-#include <cstdio>
-#include <cstdlib>
#include <sstream>
using namespace std;
@@ -42,7 +38,7 @@
JZReadBase::JZReadBase()
: mTicksPerQuarter(0),
mTrackCount(0),
- mpFd(NULL)
+ mIfs()
{
}
@@ -54,23 +50,16 @@
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-int JZReadBase::Open(const char* pFileName)
+int JZReadBase::Open(const string& FileName)
{
- if (pFileName == NULL)
+ mIfs.open(FileName.c_str(), ios::binary);
+ if (!mIfs)
{
- mpFd = stdin;
+ ostringstream Oss;
+ Oss << "Error opening file " << FileName;
+ Error(Oss.str());
+ return 0;
}
- else
- {
- mpFd = fopen(pFileName, "rb");
- if (mpFd == NULL)
- {
- ostringstream Oss;
- Oss << "Error opening file " << pFileName;
- Error(Oss.str());
- return 0;
- }
- }
return 1;
}
@@ -78,10 +67,7 @@
//-----------------------------------------------------------------------------
void JZReadBase::Close()
{
- if (mpFd != stdin)
- {
- fclose(mpFd);
- }
+ mIfs.close();
}
//*****************************************************************************
@@ -89,7 +75,7 @@
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
JZWriteBase::JZWriteBase()
- : mpFd(NULL)
+ : mOfs()
{
}
@@ -102,40 +88,18 @@
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
int JZWriteBase::Open(
- const char* pFileName,
+ const string& FileName,
int TrackCount,
int TicksPerQuarter)
{
- if (pFileName == NULL)
+ mOfs.open(FileName.c_str(), ios::binary);
+ if (!mOfs)
{
- mpFd = stdout;
+ ostringstream Oss;
+ Oss << "Error opening file " << FileName;
+ Error(Oss.str());
+ return 0;
}
- else
- {
-#ifndef __WXMSW__
- FILE *testfd = fopen(pFileName, "r");
- if (testfd)
- {
- fclose(testfd);
- char *syscmd;
- syscmd = new char[strlen("cp") + 2 * strlen(pFileName) + strlen(".backup") + 3];
- sprintf(syscmd, "cp %s %s.backup", pFileName, pFileName);
- if (system(syscmd) != 0)
- {
- fprintf(stderr, "Could not make backup file %s.backup\n", pFileName);
- }
- delete syscmd;
- }
-#endif
- mpFd = fopen(pFileName, "wb");
- if (mpFd == NULL)
- {
- ostringstream Oss;
- Oss << "Error opening file " << pFileName;
- Error(Oss.str());
- return 0;
- }
- }
return TrackCount;
}
@@ -143,10 +107,7 @@
//-----------------------------------------------------------------------------
void JZWriteBase::Close()
{
- if (mpFd != stdout)
- {
- fclose(mpFd);
- }
+ mOfs.close();
}
//*****************************************************************************
Modified: trunk/jazz/src/Events.h
===================================================================
--- trunk/jazz/src/Events.h 2013-03-17 23:02:54 UTC (rev 962)
+++ trunk/jazz/src/Events.h 2013-03-17 23:04:53 UTC (rev 963)
@@ -22,7 +22,8 @@
#pragma once
-#include <cstdio>
+#include <fstream>
+#include <string>
#include <wx/pen.h>
@@ -42,7 +43,7 @@
virtual ~JZReadBase();
- virtual int Open(const char* pFileName);
+ virtual int Open(const std::string& FileName);
virtual void Close();
@@ -59,7 +60,7 @@
int mTrackCount;
- FILE* mpFd;
+ std::ifstream mIfs;
};
//*****************************************************************************
@@ -85,7 +86,7 @@
virtual ~JZWriteBase();
virtual int Open(
- const char* pFileName,
+ const std::string& FileName,
int TrackCount,
int TicksPerQuarter);
@@ -122,7 +123,7 @@
protected:
- FILE* mpFd;
+ std::ofstream mOfs;
};
//*****************************************************************************
@@ -212,7 +213,7 @@
{
public:
- int Open(const char* pFileName, int nTracks, int TicksPerQuarter)
+ int Open(const std::string& FileName, int nTracks, int TicksPerQuarter)
{
return 1;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pst...@us...> - 2013-03-17 23:02:57
|
Revision: 962
http://sourceforge.net/p/jazzplusplus/code/962
Author: pstieber
Date: 2013-03-17 23:02:54 +0000 (Sun, 17 Mar 2013)
Log Message:
-----------
1. Updated to use std::string for file names.
2. Updated read and write code and removed old commented code and added
several events.
Modified Paths:
--------------
trunk/jazz/src/AsciiMidiFile.cpp
trunk/jazz/src/AsciiMidiFile.h
Modified: trunk/jazz/src/AsciiMidiFile.cpp
===================================================================
--- trunk/jazz/src/AsciiMidiFile.cpp 2013-03-17 23:01:02 UTC (rev 961)
+++ trunk/jazz/src/AsciiMidiFile.cpp 2013-03-17 23:02:54 UTC (rev 962)
@@ -21,26 +21,34 @@
#include "AsciiMidiFile.h"
+#include "ErrorMessage.h"
+
#include <iomanip>
+#include <sstream>
using namespace std;
//*****************************************************************************
+// Description:
+// This is the ASCII reader class. This is used to debug MIDI events.
//*****************************************************************************
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-int JZAsciiRead::Open(const char* pFileName)
+int JZAsciiRead::Open(const string& FileName)
{
+ mIfs.open(FileName.c_str());
+ if (!mIfs)
+ {
+ ostringstream Oss;
+ Oss << "Error opening file " << FileName;
+ Error(Oss.str());
+ return 0;
+ }
+
int TrackCount, TicksPerQuarter;
string Junk;
- mIfs >> Junk >> TrackCount >> Junk >> TicksPerQuarter;
+ mIfs >> Junk >> TrackCount >> Junk >> Junk >> TicksPerQuarter;
if (mIfs.fail())
-// if (
-// fscanf(
-// mpFd,
-// "Tracks %d, TicksPerQuarter %d\n",
-// &TrackCount,
-// &TicksPerQuarter) != 2)
{
return 0;
}
@@ -55,16 +63,8 @@
int Clock;
int StatusByte, Channel, Length;
- mIfs >> Clock >> StatusByte >> Channel >> Length;
+ mIfs >> Clock >> hex >> StatusByte >> dec >> Channel >> Length;
if (mIfs.fail())
-// if (
-// fscanf(
-// mpFd,
-// "%6lu %02x %2d %d ",
-// &Clock,
-// &StatusByte,
-// &Channel,
-// &Length) != 4)
{
return pEvent;
}
@@ -73,8 +73,12 @@
for (int i = 0; i < Length; ++i)
{
int d;
- mIfs >> d;
-// fscanf(mpFd, "%02x ", &d);
+ mIfs >> hex >> d >> dec;
+ if (mIfs.fail())
+ {
+ delete [] pBuffer;
+ return pEvent;
+ }
pBuffer[i] = (unsigned char)d;
}
@@ -91,22 +95,58 @@
pEvent = new JZKeyOnEvent(Clock, Channel, pBuffer[0], pBuffer[1]);
break;
+ case StatKeyPressure:
+ pEvent = new JZKeyPressureEvent(Clock, Channel, pBuffer[0], pBuffer[1]);
+ break;
+
case StatControl:
pEvent = new JZControlEvent(Clock, Channel, pBuffer[0], pBuffer[1]);
break;
+ case StatProgram:
+ pEvent = new JZProgramEvent(Clock, Channel, pBuffer[0]);
+ break;
+
+ case StatChnPressure:
+ pEvent = new JZChnPressureEvent(Clock, Channel, pBuffer[0]);
+ break;
+
case StatPitch:
pEvent = new JZPitchEvent(Clock, Channel, pBuffer[0], pBuffer[1]);
break;
- case StatProgram:
- pEvent = new JZProgramEvent(Clock, Channel, pBuffer[0]);
+ case StatSysEx:
+ pEvent = new JZSysExEvent(Clock, pBuffer, Length);
break;
+ case StatSongPtr:
+ pEvent = new JZSongPtrEvent(Clock, pBuffer, Length);
+ break;
+
+ case StatMidiClock:
+ pEvent = new JZMidiClockEvent(Clock, pBuffer, Length);
+ break;
+
+ case StatStartPlay:
+ pEvent = new JZStartPlayEvent(Clock, pBuffer, Length);
+ break;
+
+ case StatContPlay:
+ pEvent = new JZContPlayEvent(Clock, pBuffer, Length);
+ break;
+
+ case StatStopPlay:
+ pEvent = new JZStopPlayEvent(Clock, pBuffer, Length);
+ break;
+
case StatText:
pEvent = new JZTextEvent(Clock, pBuffer, Length);
break;
+ case StatCopyright:
+ pEvent = new JZCopyrightEvent(Clock, pBuffer, Length);
+ break;
+
case StatTrackName:
pEvent = new JZTrackNameEvent(Clock, pBuffer, Length);
break;
@@ -116,12 +156,17 @@
break;
case StatEndOfTrack:
+ pEvent = new JZEndOfTrackEvent(Clock);
break;
case StatSetTempo:
pEvent = new JZSetTempoEvent(Clock, pBuffer[0], pBuffer[1], pBuffer[2]);
break;
+ case StatMtcOffset:
+ pEvent = new JZMtcOffsetEvent(Clock, pBuffer, Length);
+ break;
+
case StatTimeSignat:
pEvent = new JZTimeSignatEvent(
Clock,
@@ -131,9 +176,28 @@
pBuffer[3]);
break;
- case StatSysEx:
- pEvent = new JZSysExEvent(Clock, pBuffer, Length);
+ case StatKeySignat:
+ pEvent = new JZKeySignatEvent(Clock, pBuffer[0], pBuffer[1]);
break;
+
+ case StatJazzMeta:
+ if (memcmp(pBuffer, "JAZ2", 4) == 0)
+ {
+ pEvent = new JZJazzMetaEvent(Clock, pBuffer, Length);
+ }
+ else
+ {
+ pEvent = new JZMetaEvent(Clock, StatusByte, pBuffer, Length);
+ }
+ break;
+
+ case StatPlayTrack:
+ pEvent = new JZPlayTrackEvent(Clock, pBuffer, Length);
+ break;
+
+ case 33:
+ pEvent = new JZMetaEvent(Clock, StatusByte, pBuffer, Length);
+ break;
}
delete [] pBuffer;
@@ -148,33 +212,31 @@
string String;
mIfs >> String;
return String == "NextTrack";
-// return fscanf(mpFd, "NextTrack\n") == 0;
}
//*****************************************************************************
// Description:
-// Ascii-Output (debug)
+// This is the ASCII writer class. This is used to debug MIDI events.
//*****************************************************************************
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
int JZAsciiWrite::Open(
- const char* pFileName,
+ const string& FileName,
int TrackCount,
int TicksPerQuarter)
{
- if (!JZWriteBase::Open(pFileName, TrackCount, TicksPerQuarter))
+ mOfs.open(FileName.c_str());
+ if (!mOfs)
{
+ ostringstream Oss;
+ Oss << "Error opening file " << FileName;
+ Error(Oss.str());
return 0;
}
mOfs
<< "Tracks " << TrackCount << ", TicksPerQuarter " << TicksPerQuarter
<< endl;
-// fprintf(
-// mpFd,
-// "Tracks %d, TicksPerQuarter %d\n",
-// TrackCount,
-// TicksPerQuarter);
return TrackCount;
}
@@ -187,29 +249,24 @@
mOfs
<< setw(6) << pEvent->GetClock()
- << ' ' << setw(2) << hex << pEvent->GetStat()
- << ' ' << dec;
-// fprintf(mpFd, "%6d %02x ", pEvent->GetClock(), pEvent->GetStat());
+ << ' ' << setw(2) << hex << static_cast<unsigned>(pEvent->GetStat())
+ << dec;
if ((pChannelEvent = pEvent->IsChannelEvent()) != 0)
{
- mOfs << setw(2) << pChannelEvent->GetChannel() << ' ';
-// fprintf(mpFd, "%2d ", pChannelEvent->GetChannel());
+ mOfs
+ << ' ' << setw(2) << static_cast<unsigned>(pChannelEvent->GetChannel());
}
else
{
- mOfs << "-1 ";
-// fprintf(mpFd, "-1 ");
+ mOfs << " -1";
}
- mOfs << Length << ' ';
-// fprintf(mpFd, "%d ", Length);
+ mOfs << ' ' << Length;
for (int i = 0; i < Length; ++i)
{
- mOfs << setw(2) << hex << pData[i] << dec;
-// fprintf(mpFd, "%02x ", pData[i]);
+ mOfs << ' ' << setw(2) << hex << static_cast<unsigned>(pData[i]) << dec;
}
- mOfs << '\n';
-// fprintf(mpFd, "\n");
+ mOfs << endl;
return 0;
}
@@ -219,5 +276,4 @@
void JZAsciiWrite::NextTrack()
{
mOfs << "NextTrack" << endl;
-// fprintf(mpFd, "NextTrack\n");
}
Modified: trunk/jazz/src/AsciiMidiFile.h
===================================================================
--- trunk/jazz/src/AsciiMidiFile.h 2013-03-17 23:01:02 UTC (rev 961)
+++ trunk/jazz/src/AsciiMidiFile.h 2013-03-17 23:02:54 UTC (rev 962)
@@ -29,7 +29,7 @@
{
public:
- virtual int Open(const char* pFileName);
+ virtual int Open(const std::string& FileName);
virtual JZEvent* Read();
@@ -43,7 +43,7 @@
public:
virtual int Open(
- const char* pFileName,
+ const std::string& FileName,
int TrackCount,
int TicksPerQuarter);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pst...@us...> - 2013-03-17 23:01:05
|
Revision: 961
http://sourceforge.net/p/jazzplusplus/code/961
Author: pstieber
Date: 2013-03-17 23:01:02 +0000 (Sun, 17 Mar 2013)
Log Message:
-----------
Made cosmetic changes.
Modified Paths:
--------------
trunk/jazz/src/Harmony.cpp
Modified: trunk/jazz/src/Harmony.cpp
===================================================================
--- trunk/jazz/src/Harmony.cpp 2013-03-17 13:15:25 UTC (rev 960)
+++ trunk/jazz/src/Harmony.cpp 2013-03-17 23:01:02 UTC (rev 961)
@@ -882,9 +882,8 @@
mMargin = 1;
}
+ mHasChanged = false;
- mHasChanged = false;
-
SetScrollbars(0, (int)(mChordHeight + 0.5), 0, 12 + SEQMAX / 8 + 2, 0, 0);
}
@@ -2390,6 +2389,8 @@
mpHbWindow->TransposeSelection();
}
+//*****************************************************************************
+//*****************************************************************************
void CreateHarmonyBrowser()
{
if (!gpHarmonyBrowser)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pst...@us...> - 2013-03-17 13:15:28
|
Revision: 960
http://sourceforge.net/p/jazzplusplus/code/960
Author: pstieber
Date: 2013-03-17 13:15:25 +0000 (Sun, 17 Mar 2013)
Log Message:
-----------
Changed a long to an int. These are the same size in 32-bit Windows and Linux compilers.
Modified Paths:
--------------
trunk/jazz/src/AsciiMidiFile.cpp
Modified: trunk/jazz/src/AsciiMidiFile.cpp
===================================================================
--- trunk/jazz/src/AsciiMidiFile.cpp 2013-03-17 13:11:21 UTC (rev 959)
+++ trunk/jazz/src/AsciiMidiFile.cpp 2013-03-17 13:15:25 UTC (rev 960)
@@ -53,7 +53,7 @@
{
JZEvent* pEvent = 0;
- long Clock;
+ int Clock;
int StatusByte, Channel, Length;
mIfs >> Clock >> StatusByte >> Channel >> Length;
if (mIfs.fail())
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pst...@us...> - 2013-03-17 13:11:25
|
Revision: 959
http://sourceforge.net/p/jazzplusplus/code/959
Author: pstieber
Date: 2013-03-17 13:11:21 +0000 (Sun, 17 Mar 2013)
Log Message:
-----------
Updated to use C++ stream code instead of C-style file I/O.
Modified Paths:
--------------
trunk/jazz/src/AsciiMidiFile.cpp
Modified: trunk/jazz/src/AsciiMidiFile.cpp
===================================================================
--- trunk/jazz/src/AsciiMidiFile.cpp 2013-03-17 10:53:46 UTC (rev 958)
+++ trunk/jazz/src/AsciiMidiFile.cpp 2013-03-17 13:11:21 UTC (rev 959)
@@ -21,6 +21,10 @@
#include "AsciiMidiFile.h"
+#include <iomanip>
+
+using namespace std;
+
//*****************************************************************************
//*****************************************************************************
//-----------------------------------------------------------------------------
@@ -28,12 +32,15 @@
int JZAsciiRead::Open(const char* pFileName)
{
int TrackCount, TicksPerQuarter;
- if (
- fscanf(
- mpFd,
- "Tracks %d, TicksPerQuarter %d\n",
- &TrackCount,
- &TicksPerQuarter) != 2)
+ string Junk;
+ mIfs >> Junk >> TrackCount >> Junk >> TicksPerQuarter;
+ if (mIfs.fail())
+// if (
+// fscanf(
+// mpFd,
+// "Tracks %d, TicksPerQuarter %d\n",
+// &TrackCount,
+// &TicksPerQuarter) != 2)
{
return 0;
}
@@ -48,14 +55,16 @@
long Clock;
int StatusByte, Channel, Length;
- if (
- fscanf(
- mpFd,
- "%6lu %02x %2d %d ",
- &Clock,
- &StatusByte,
- &Channel,
- &Length) != 4)
+ mIfs >> Clock >> StatusByte >> Channel >> Length;
+ if (mIfs.fail())
+// if (
+// fscanf(
+// mpFd,
+// "%6lu %02x %2d %d ",
+// &Clock,
+// &StatusByte,
+// &Channel,
+// &Length) != 4)
{
return pEvent;
}
@@ -64,7 +73,8 @@
for (int i = 0; i < Length; ++i)
{
int d;
- fscanf(mpFd, "%02x ", &d);
+ mIfs >> d;
+// fscanf(mpFd, "%02x ", &d);
pBuffer[i] = (unsigned char)d;
}
@@ -135,7 +145,10 @@
//-----------------------------------------------------------------------------
int JZAsciiRead::NextTrack()
{
- return fscanf(mpFd, "NextTrack\n") == 0;
+ string String;
+ mIfs >> String;
+ return String == "NextTrack";
+// return fscanf(mpFd, "NextTrack\n") == 0;
}
//*****************************************************************************
@@ -154,11 +167,14 @@
return 0;
}
- fprintf(
- mpFd,
- "Tracks %d, TicksPerQuarter %d\n",
- TrackCount,
- TicksPerQuarter);
+ mOfs
+ << "Tracks " << TrackCount << ", TicksPerQuarter " << TicksPerQuarter
+ << endl;
+// fprintf(
+// mpFd,
+// "Tracks %d, TicksPerQuarter %d\n",
+// TrackCount,
+// TicksPerQuarter);
return TrackCount;
}
@@ -169,22 +185,31 @@
{
JZChannelEvent* pChannelEvent;
- fprintf(mpFd, "%6d %02x ", pEvent->GetClock(), pEvent->GetStat());
+ mOfs
+ << setw(6) << pEvent->GetClock()
+ << ' ' << setw(2) << hex << pEvent->GetStat()
+ << ' ' << dec;
+// fprintf(mpFd, "%6d %02x ", pEvent->GetClock(), pEvent->GetStat());
if ((pChannelEvent = pEvent->IsChannelEvent()) != 0)
{
- fprintf(mpFd, "%2d ", pChannelEvent->GetChannel());
+ mOfs << setw(2) << pChannelEvent->GetChannel() << ' ';
+// fprintf(mpFd, "%2d ", pChannelEvent->GetChannel());
}
else
{
- fprintf(mpFd, "-1 ");
+ mOfs << "-1 ";
+// fprintf(mpFd, "-1 ");
}
- fprintf(mpFd, "%d ", Length);
+ mOfs << Length << ' ';
+// fprintf(mpFd, "%d ", Length);
for (int i = 0; i < Length; ++i)
{
- fprintf(mpFd, "%02x ", pData[i]);
+ mOfs << setw(2) << hex << pData[i] << dec;
+// fprintf(mpFd, "%02x ", pData[i]);
}
- fprintf(mpFd, "\n");
+ mOfs << '\n';
+// fprintf(mpFd, "\n");
return 0;
}
@@ -193,5 +218,6 @@
//-----------------------------------------------------------------------------
void JZAsciiWrite::NextTrack()
{
- fprintf(mpFd, "NextTrack\n");
+ mOfs << "NextTrack" << endl;
+// fprintf(mpFd, "NextTrack\n");
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pst...@us...> - 2013-03-17 10:53:50
|
Revision: 958
http://sourceforge.net/p/jazzplusplus/code/958
Author: pstieber
Date: 2013-03-17 10:53:46 +0000 (Sun, 17 Mar 2013)
Log Message:
-----------
Added a "Visit Web Site..." button to the about dialog.
Modified Paths:
--------------
trunk/jazz/src/AboutDialog.cpp
trunk/jazz/src/AboutDialog.h
trunk/jazz/src/JazzPlusPlusApplication.h
trunk/jazz/src/Resources.h
Modified: trunk/jazz/src/AboutDialog.cpp
===================================================================
--- trunk/jazz/src/AboutDialog.cpp 2013-03-17 10:18:20 UTC (rev 957)
+++ trunk/jazz/src/AboutDialog.cpp 2013-03-17 10:53:46 UTC (rev 958)
@@ -45,6 +45,8 @@
//-----------------------------------------------------------------------------
BEGIN_EVENT_TABLE(JZAboutDialog, wxDialog)
+ EVT_BUTTON(IDC_BN_VISIT_WEB_SITE, JZAboutDialog::OnVisitWebSite)
+
EVT_BUTTON(wxID_HELP, JZAboutDialog::OnHelp)
END_EVENT_TABLE()
@@ -102,11 +104,6 @@
// + Paragraph2String +
// "</p>"
- "<p><center>"
- "<a href=\"http://jazzplusplus.sourceforge.net/\">"
- "http://jazzplusplus.sourceforge.net/</a>"
- "</center></p>"
-
"<p><center>" + InformationString + "</center></p>"
"<center><h5>" + "Credits" + "</h5></center>"
@@ -167,6 +164,11 @@
wxBoxSizer* pButtonsSizer = new wxBoxSizer(wxHORIZONTAL);
pButtonsSizer->Add(new wxButton(this, wxID_OK, "OK"), 0, wxALL, 10);
+ pButtonsSizer->Add(
+ new wxButton(this, IDC_BN_VISIT_WEB_SITE, "Visit Web Site..."),
+ 0,
+ wxALL,
+ 10);
pButtonsSizer->Add(new wxButton(this, wxID_HELP, "Help"), 0, wxALL, 10);
pTopSizer->Add(pButtonsSizer, 0, wxALIGN_CENTER);
@@ -190,6 +192,13 @@
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
+void JZAboutDialog::OnVisitWebSite(wxCommandEvent&)
+{
+ wxLaunchDefaultBrowser("http://jazzplusplus.sourceforge.net/");
+}
+
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
void JZAboutDialog::OnHelp(wxCommandEvent& Event)
{
::wxGetApp().DisplayHelpContents();
Modified: trunk/jazz/src/AboutDialog.h
===================================================================
--- trunk/jazz/src/AboutDialog.h 2013-03-17 10:18:20 UTC (rev 957)
+++ trunk/jazz/src/AboutDialog.h 2013-03-17 10:53:46 UTC (rev 958)
@@ -41,6 +41,8 @@
protected:
+ void OnVisitWebSite(wxCommandEvent& Event);
+
void OnHelp(wxCommandEvent& Event);
protected:
Modified: trunk/jazz/src/JazzPlusPlusApplication.h
===================================================================
--- trunk/jazz/src/JazzPlusPlusApplication.h 2013-03-17 10:18:20 UTC (rev 957)
+++ trunk/jazz/src/JazzPlusPlusApplication.h 2013-03-17 10:53:46 UTC (rev 958)
@@ -164,9 +164,11 @@
// looking at old commit messages.
// 11 1/21/2008 See minor version 3.
// 12 9/1/2008 See minor version 4.
+// 13 3/17/2013 Fixed closing while recording and/or playing back.
+// 14 3/17/2013 Added "Visit Web Site..." button to the about dialog.
//-----------------------------------------------------------------------------
inline
int JZJazzPlusPlusApplication::GetBuildNumber() const
{
- return 12;
+ return 14;
}
Modified: trunk/jazz/src/Resources.h
===================================================================
--- trunk/jazz/src/Resources.h 2013-03-17 10:18:20 UTC (rev 957)
+++ trunk/jazz/src/Resources.h 2013-03-17 10:53:46 UTC (rev 958)
@@ -29,112 +29,114 @@
// of wxID_HIGHEST here.
#define wxID_HIGHEST 5999
-#define ID_FILE_REVERT_TO_SAVED wxID_HIGHEST + 1
+#define ID_FILE_REVERT_TO_SAVED (wxID_HIGHEST + 1)
-#define ID_IMPORT_MIDI wxID_HIGHEST + 2
-#define ID_EXPORT_MIDI wxID_HIGHEST + 3
-#define ID_EXPORT_SELECTION_AS_MIDI wxID_HIGHEST + 4
+#define ID_IMPORT_MIDI (wxID_HIGHEST + 2)
+#define ID_EXPORT_MIDI (wxID_HIGHEST + 3)
+#define ID_EXPORT_SELECTION_AS_MIDI (wxID_HIGHEST + 4)
-#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_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_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
-#define ID_AUDIO_LOAD_SAMPLE_SET wxID_HIGHEST + 22
-#define ID_AUDIO_SAVE_SAMPLE_SET wxID_HIGHEST + 23
-#define ID_AUDIO_SAVE_SAMPLE_SET_AS wxID_HIGHEST + 24
-#define ID_AUDIO_NEW_SAMPLE_SET wxID_HIGHEST + 25
+#define ID_AUDIO_GLOBAL_SETTINGS (wxID_HIGHEST + 20)
+#define ID_AUDIO_SAMPLE_SETTINGS (wxID_HIGHEST + 21)
+#define ID_AUDIO_LOAD_SAMPLE_SET (wxID_HIGHEST + 22)
+#define ID_AUDIO_SAVE_SAMPLE_SET (wxID_HIGHEST + 23)
+#define ID_AUDIO_SAVE_SAMPLE_SET_AS (wxID_HIGHEST + 24)
+#define ID_AUDIO_NEW_SAMPLE_SET (wxID_HIGHEST + 25)
-#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_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_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_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_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_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_PLAY wxID_HIGHEST + 80
-#define ID_PLAY_LOOP wxID_HIGHEST + 81
-#define ID_RECORD wxID_HIGHEST + 82
+#define ID_PLAY (wxID_HIGHEST + 80)
+#define ID_PLAY_LOOP (wxID_HIGHEST + 81)
+#define ID_RECORD (wxID_HIGHEST + 82)
-#define ID_SELECT wxID_HIGHEST + 85
+#define ID_SELECT (wxID_HIGHEST + 85)
-#define ID_CHANGE_LENGTH wxID_HIGHEST + 90
+#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_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_TOOLS_HARMONY_BROWSER (wxID_HIGHEST + 95)
-#define ID_HELP_PIANO_WINDOW wxID_HIGHEST + 100
+#define ID_HELP_PIANO_WINDOW (wxID_HIGHEST + 100)
-#define MEN_CLEAR wxID_HIGHEST + 110
-#define ID_VIEW_SETTINGS wxID_HIGHEST + 120
+#define MEN_CLEAR (wxID_HIGHEST + 110)
+#define ID_VIEW_SETTINGS (wxID_HIGHEST + 120)
-#define IDC_KB_VOLUME wxID_HIGHEST + 1000
+#define IDC_BN_VISIT_WEB_SITE (wxID_HIGHEST + 1000)
-#define IDC_KB_VELOCITY wxID_HIGHEST + 1100
-#define IDC_KB_OFF_VELOCITY wxID_HIGHEST + 1101
-#define IDC_KB_CHANNEL wxID_HIGHEST + 1102
+#define IDC_KB_VOLUME (wxID_HIGHEST + 1050)
+#define IDC_KB_VELOCITY (wxID_HIGHEST + 1100)
+#define IDC_KB_OFF_VELOCITY (wxID_HIGHEST + 1101)
+#define IDC_KB_CHANNEL (wxID_HIGHEST + 1102)
+
// JZVelocityDialog resource IDs.
-#define IDC_KB_VELOCITY_START wxID_HIGHEST + 1200
-#define IDC_KB_VELOCITY_STOP wxID_HIGHEST + 1201
+#define IDC_KB_VELOCITY_START (wxID_HIGHEST + 1200)
+#define IDC_KB_VELOCITY_STOP (wxID_HIGHEST + 1201)
// JZLengthDialog resource IDs.
-#define IDC_KB_LENGTH_START wxID_HIGHEST + 1210
-#define IDC_KB_LENGTH_STOP wxID_HIGHEST + 1211
+#define IDC_KB_LENGTH_START (wxID_HIGHEST + 1210)
+#define IDC_KB_LENGTH_STOP (wxID_HIGHEST + 1211)
// JZMidiChannelDialog resource IDs.
-#define IDC_KB_MIDI_CHANNEL wxID_HIGHEST + 1220
+#define IDC_KB_MIDI_CHANNEL (wxID_HIGHEST + 1220)
// JZQuantizeDialog resource IDs.
-#define IDC_KB_GROOVE wxID_HIGHEST + 1230
-#define IDC_KB_DELAY wxID_HIGHEST + 1231
+#define IDC_KB_GROOVE (wxID_HIGHEST + 1230)
+#define IDC_KB_DELAY (wxID_HIGHEST + 1231)
// JZTransposeDialog resource IDs.
-#define IDC_KB_AMOUNT wxID_HIGHEST + 1232
+#define IDC_KB_AMOUNT (wxID_HIGHEST + 1232)
// JZSamplesDialog resource IDs.
-#define IDC_BN_SD_FILE_SELECT_BROWSE wxID_HIGHEST + 1240
+#define IDC_BN_SD_FILE_SELECT_BROWSE (wxID_HIGHEST + 1240)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pst...@us...> - 2013-03-17 10:18:23
|
Revision: 957
http://sourceforge.net/p/jazzplusplus/code/957
Author: pstieber
Date: 2013-03-17 10:18:20 +0000 (Sun, 17 Mar 2013)
Log Message:
-----------
Added code to handle application close via the X while playing.
Modified Paths:
--------------
trunk/jazz/src/TrackFrame.cpp
trunk/jazz/src/TrackFrame.h
Modified: trunk/jazz/src/TrackFrame.cpp
===================================================================
--- trunk/jazz/src/TrackFrame.cpp 2013-01-10 04:23:56 UTC (rev 956)
+++ trunk/jazz/src/TrackFrame.cpp 2013-03-17 10:18:20 UTC (rev 957)
@@ -77,6 +77,8 @@
//-----------------------------------------------------------------------------
BEGIN_EVENT_TABLE(JZTrackFrame, JZEventFrame)
+ EVT_CLOSE(JZTrackFrame::OnClose)
+
EVT_MENU(wxID_NEW, JZTrackFrame::OnFileNew)
EVT_MENU(wxID_OPEN, JZTrackFrame::OnFileOpenProject)
@@ -472,6 +474,34 @@
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
+void JZTrackFrame::OnClose(wxCloseEvent& CloseEvent)
+{
+ if (CloseEvent.CanVeto() && mpProject && mpProject->IsPlaying())
+ {
+ if (
+ wxMessageBox(
+ "Currently playing the MIDI file... continue closing?",
+ "Please confirm",
+ wxICON_QUESTION | wxYES_NO) != wxYES )
+ {
+ CloseEvent.Veto();
+ return;
+ }
+ }
+
+ if (mpProject && mpProject->IsPlaying())
+ {
+ // Since we cannont veto the close event, stop a playing project.
+ mpProject->Stop();
+ }
+
+ // At this point, we can either call Destroy(), or CloseEvent.Skip()
+ // since the default event handler also calls Destroy().
+ CloseEvent.Skip();
+}
+
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
void JZTrackFrame::OnFileNew(wxCommandEvent& Event)
{
if (wxMessageBox("Clear Song?", "Sure?", wxOK | wxCANCEL) == wxOK)
Modified: trunk/jazz/src/TrackFrame.h
===================================================================
--- trunk/jazz/src/TrackFrame.h 2013-01-10 04:23:56 UTC (rev 956)
+++ trunk/jazz/src/TrackFrame.h 2013-03-17 10:18:20 UTC (rev 957)
@@ -69,6 +69,8 @@
void CreateMenu();
+ void OnClose(wxCloseEvent& CloseEvent);
+
void OnFileNew(wxCommandEvent& Event);
void OnFileOpenProject(wxCommandEvent& Event);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pst...@us...> - 2013-01-10 04:24:00
|
Revision: 956
http://sourceforge.net/p/jazzplusplus/code/956
Author: pstieber
Date: 2013-01-10 04:23:56 +0000 (Thu, 10 Jan 2013)
Log Message:
-----------
Fixed the svn URL and removed the debug option.
Modified Paths:
--------------
web/htdocs/buildingjazz/index.php
Modified: web/htdocs/buildingjazz/index.php
===================================================================
--- web/htdocs/buildingjazz/index.php 2013-01-10 04:19:43 UTC (rev 955)
+++ web/htdocs/buildingjazz/index.php 2013-01-10 04:23:56 UTC (rev 956)
@@ -83,7 +83,7 @@
You must have a Subversion client installed on your machine.
<PRE>
-svn checkout https://jazzplusplus.svn.sourceforge.net/svnroot/jazzplusplus/trunk/jazz jazz
+svn checkout svn://svn.code.sf.net/p/jazzplusplus/code/trunk/jazz jazz
</PRE>
</LI>
@@ -116,7 +116,6 @@
<PRE>
../jazz/configure \
--prefix=/usr/local/Jazz++ \
- --enable-debug \
--enable-alsa \
--enable-sequencer2
</PRE>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pst...@us...> - 2013-01-10 04:19:47
|
Revision: 955
http://sourceforge.net/p/jazzplusplus/code/955
Author: pstieber
Date: 2013-01-10 04:19:43 +0000 (Thu, 10 Jan 2013)
Log Message:
-----------
Updated the svn URL, autoreconf and make install instructions.
Modified Paths:
--------------
web/htdocs/buildingtex2rtf/index.php
Modified: web/htdocs/buildingtex2rtf/index.php
===================================================================
--- web/htdocs/buildingtex2rtf/index.php 2013-01-10 04:17:05 UTC (rev 954)
+++ web/htdocs/buildingtex2rtf/index.php 2013-01-10 04:19:43 UTC (rev 955)
@@ -41,7 +41,7 @@
You must have a Subversion client loaded on your machine.
<PRE>
-svn checkout https://jazzplusplus.svn.sourceforge.net/svnroot/jazzplusplus/tex2rtf tex2rtf
+svn checkout svn://svn.code.sf.net/p/tex2rtf/code/trunk tex2rtf
</PRE>
</LI>
@@ -51,7 +51,7 @@
<PRE>
cd tex2rtf
-autoreconf --verbose
+autoreconf --install --verbose
</PRE>
</LI>
@@ -90,9 +90,7 @@
If all goes well with the build, install tex2rtf using the following command.
<PRE>
-su
-make install
-exit
+sudo make install
</PRE>
</LI>
</OL>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pst...@us...> - 2013-01-10 04:17:10
|
Revision: 954
http://sourceforge.net/p/jazzplusplus/code/954
Author: pstieber
Date: 2013-01-10 04:17:05 +0000 (Thu, 10 Jan 2013)
Log Message:
-----------
Updated the wxWidgets build instructions for the latest svn version.
Modified Paths:
--------------
web/htdocs/buildingwx/index.php
Modified: web/htdocs/buildingwx/index.php
===================================================================
--- web/htdocs/buildingwx/index.php 2013-01-08 04:37:01 UTC (rev 953)
+++ web/htdocs/buildingwx/index.php 2013-01-10 04:17:05 UTC (rev 954)
@@ -23,7 +23,7 @@
version of wxWidgets was compiled for Windows, Linux, and the Mac. The Windows
build was generated using Visual Studio. Either Visual Studio .NET 2008 or
Visual Studio .NET 2010 can be used on Windows. The Linux install was tested
-using Fedora 14 using GCC 4.5.1, Mandriva 2008.0 using GCC 4.2.2, and Debian 4.0
+using Fedora 17 using GCC 4.7.2, Mandriva 2008.0 using GCC 4.2.2, and Debian 4.0
(i386 & amd64) using gcc-4.1.2. The Mac build was tested using Mac OS X 10.5.2
and GCC 4.0.1.
</P>
@@ -38,22 +38,22 @@
<OL>
<LI>
Download
-<A NAME="wxWidgets-2.9.2.zip-Download"
-HREF="http://prdownloads.sourceforge.net/wxwindows/wxWidgets-2.9.2.zip">
-<TT>wxWidgets-2.9.2.zip</TT></A> from the wxWidgets web site.
+<A NAME="wxWidgets-2.9.4.zip-Download"
+HREF="http://prdownloads.sourceforge.net/wxwindows/wxWidgets-2.9.4.zip">
+<TT>wxWidgets-2.9.4.zip</TT></A> from the wxWidgets web site.
</LI>
<LI>
Extract the zip file to <TT>C:\ExternalPackages</TT>. Extracting creates a
-<TT>wxWidgets-2.9.2</TT> directory directly under <TT>C:\ExternalPackages</TT>.
+<TT>wxWidgets-2.9.4</TT> directory directly under <TT>C:\ExternalPackages</TT>.
</LI>
<LI>
Change the name of the top-level wxWidgets directory to
-<TT>wxMSW-2.9.2-VC10</TT> so other versions of wxWidgets can be built with
+<TT>wxMSW-2.9.4-VC10</TT> so other versions of wxWidgets can be built with
other compilers in parallel with this directory.
</LI>
<LI>
Make the following changes to
-<TT>C:\ExternalPackages\wxMSW-2.9.2-VC10\include\wx\msw\setup.h</TT>:
+<TT>C:\ExternalPackages\wxMSW-2.9.4-VC10\include\wx\msw\setup.h</TT>:
<P>
@@ -89,7 +89,7 @@
are installed and ready to run.
</LI>
<LI>
-Change directory to <TT>C:\ExternalPackages\wxMSW-2.9.2-VC10\build\msw</TT>.
+Change directory to <TT>C:\ExternalPackages\wxMSW-2.9.4-VC10\build\msw</TT>.
</LI>
<LI>
Build the 32-bit, debug, static version of the wxWidgets libraries by typing:
@@ -109,7 +109,7 @@
</LI>
<LI>To conserve disk space, remove the build directories (<TT>vc_mswu</TT> and
<TT>vc_mswud</TT>) under
-<TT>c:\ExternalPackages\wxMSW-2.9.2-VC10\build\msw</TT>.
+<TT>c:\ExternalPackages\wxMSW-2.9.4-VC10\build\msw</TT>.
</LI>
</OL>
@@ -124,8 +124,8 @@
trick.
<PRE>
-export PATH=/usr/local/wx-2.9.2/bin:$PATH
-export LD_LIBRARY_PATH=/usr/local/wx-2.9.2/lib:$LD_LIBRARY_PATH
+export PATH=/usr/local/wx-svn/bin:$PATH
+export LD_LIBRARY_PATH=/usr/local/wx-svn/lib:$LD_LIBRARY_PATH
</PRE>
After adding the above lines to your <TT>.bash_profile</TT>
@@ -170,14 +170,11 @@
<PRE>
../wxWidgets/configure \
- --prefix=/usr/local/wx-2.9.2d \
+ --prefix=/usr/local/wxsvnd \
--with-gtk \
--enable-exceptions \
- --disable-compat26 \
- --disable-visibility \
+ --disable-compat28 \
--with-regex \
- --enable-std_iostreams \
- --enable-std_string \
--enable-stl \
--enable-debug \
--enable-debug_gdb
@@ -199,9 +196,7 @@
<LI>If all goes well with the build, try to install wxWidgets as root.
<PRE>
-su
-make install
-exit
+sudo make install
</PRE>
</LI>
@@ -211,23 +206,27 @@
<PRE>
cd ../WxBuildRelease
../wxWidgets/configure \
- --prefix=/usr/local/wx-2.9.2 \
+ --prefix=/usr/local/wxsvn \
--with-gtk \
--enable-exceptions \
- --disable-compat26 \
- --disable-visibility \
+ --disable-compat28 \
--with-regex \
- --enable-std_iostreams \
- --enable-std_string \
--enable-stl
make 2>&1 | tee BuildLog
-su
-make install
-exit
+sudo make install
</PRE>
</LI>
<LI>
+Depending on the version of Linux you are using, you may have to run
+<TT>ldconfig</TT> as root.
+
+<PRE>
+sudo ldconfig
+</PRE>
+</LI>
+
+<LI>
You can run the following command to determine the default configuration.
<PRE>
@@ -251,18 +250,18 @@
<LI>
Download
-<A NAME="wxWidgets-2.9.2.tar.bz2"
-HREF="http://sourceforge.net/projects/wxwindows/files/wxWidgets-2.9.2.tar.bz2">
-<TT>wxWidgets-2.9.2.tar.bz2</TT></A> from the wxWidgets web site and extract this
+<A NAME="wxWidgets-2.9.4.tar.bz2"
+HREF="http://sourceforge.net/projects/wxwindows/files/wxWidgets-2.9.4.tar.bz2">
+<TT>wxWidgets-2.9.4.tar.bz2</TT></A> from the wxWidgets web site and extract this
file under your <TT>OutsideSource</TT> directory.
</LI>
-<LI> Create a directory called <TT>WxBuild-2.9.2</TT> in parallel with the
-<TT>wxWidgets-2.9.2</TT> directory and change directory to that location.
+<LI> Create a directory called <TT>WxBuild-2.9.4</TT> in parallel with the
+<TT>wxWidgets-2.9.4</TT> directory and change directory to that location.
<PRE>
-mkdir WxBuild-2.9.2
-cd WxBuild-2.9.2
+mkdir WxBuild-2.9.4
+cd WxBuild-2.9.4
</PRE>
</LI>
@@ -270,13 +269,11 @@
configure options.
<PRE>
-../wxWidgets-2.9.2/configure \
- --prefix=$HOME/wx-2.9.2 \
+../wxWidgets-2.9.4/configure \
+ --prefix=$HOME/wx-2.9.4 \
--enable-exceptions \
- --disable-compat26 \
+ --disable-compat28 \
--with-regex \
- --enable-std_iostreams \
- --enable-std_string \
--enable-stl \
--with-mac \
--enable-debug \
@@ -310,8 +307,8 @@
<TT>.bash_profile</TT> will do the trick.
<PRE>
-export PATH=/usr/local/wx-2.9.2/bin:$PATH
-export LD_LIBRARY_PATH=/usr/local/wx-2.9.2/lib:$LD_LIBRARY_PATH
+export PATH=/usr/local/wx-2.9.4/bin:$PATH
+export LD_LIBRARY_PATH=/usr/local/wx-2.9.4/lib:$LD_LIBRARY_PATH
</PRE>
After adding the above lines to your <TT>.bash_profile</TT>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pst...@us...> - 2013-01-08 04:37:04
|
Revision: 953
http://sourceforge.net/p/jazzplusplus/code/953
Author: pstieber
Date: 2013-01-08 04:37:01 +0000 (Tue, 08 Jan 2013)
Log Message:
-----------
Moved DEV_ALSA to from Jazz++.cbp to codeblocks/config.h.
Modified Paths:
--------------
trunk/jazz/codeblocks/Jazz++.cbp
trunk/jazz/codeblocks/config.h
Modified: trunk/jazz/codeblocks/Jazz++.cbp
===================================================================
--- trunk/jazz/codeblocks/Jazz++.cbp 2013-01-08 04:34:49 UTC (rev 952)
+++ trunk/jazz/codeblocks/Jazz++.cbp 2013-01-08 04:37:01 UTC (rev 953)
@@ -39,7 +39,6 @@
<Compiler>
<Add option="-Wall" />
<Add option="`wx-config --cflags`" />
- <Add option="-DDEV_ALSA" />
</Compiler>
<Linker>
<Add option="`wx-config --libs`" />
Modified: trunk/jazz/codeblocks/config.h
===================================================================
--- trunk/jazz/codeblocks/config.h 2013-01-08 04:34:49 UTC (rev 952)
+++ trunk/jazz/codeblocks/config.h 2013-01-08 04:37:01 UTC (rev 953)
@@ -1,3 +1,4 @@
#pragma once
+#define DEV_ALSA
#define DEV_SEQUENCER2
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pst...@us...> - 2013-01-08 04:34:53
|
Revision: 952
http://sourceforge.net/p/jazzplusplus/code/952
Author: pstieber
Date: 2013-01-08 04:34:49 +0000 (Tue, 08 Jan 2013)
Log Message:
-----------
Changed header sentries to #pragma once.
Modified Paths:
--------------
trunk/jazz/src/AlsaDriver.h
trunk/jazz/src/AlsaPlayer.h
trunk/jazz/src/AlsaThru.h
trunk/jazz/src/AudioDriver.h
trunk/jazz/src/CommandUtilities.h
trunk/jazz/src/ResourceDialog.h
trunk/jazz/src/SignalInterface.h
Modified: trunk/jazz/src/AlsaDriver.h
===================================================================
--- trunk/jazz/src/AlsaDriver.h 2013-01-07 15:32:52 UTC (rev 951)
+++ trunk/jazz/src/AlsaDriver.h 2013-01-08 04:34:49 UTC (rev 952)
@@ -20,8 +20,7 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//*****************************************************************************
-#ifndef JZ_ALSADRIVER_H
-#define JZ_ALSADRIVER_H
+#pragma once
#include "Events.h"
#include "Player.h"
@@ -114,5 +113,3 @@
JZAlsaAudioListener* mpListener;
JZAudioRecordBuffer recbuffers;
};
-
-#endif // !defined(JZ_ALSADRIVER_H)
Modified: trunk/jazz/src/AlsaPlayer.h
===================================================================
--- trunk/jazz/src/AlsaPlayer.h 2013-01-07 15:32:52 UTC (rev 951)
+++ trunk/jazz/src/AlsaPlayer.h 2013-01-08 04:34:49 UTC (rev 952)
@@ -20,8 +20,7 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//*****************************************************************************
-#ifndef JZ_ALSAPLAY_H
-#define JZ_ALSAPLAY_H
+#pragma once
#include "Player.h"
#include "AlsaThru.h"
@@ -147,6 +146,3 @@
JZAlsaThru *thru;
int ithru, othru; // index in iaddr, oaddr of source/target device
};
-
-
-#endif // !defined(JZ_ALSAPLAY_H)
Modified: trunk/jazz/src/AlsaThru.h
===================================================================
--- trunk/jazz/src/AlsaThru.h 2013-01-07 15:32:52 UTC (rev 951)
+++ trunk/jazz/src/AlsaThru.h 2013-01-08 04:34:49 UTC (rev 952)
@@ -20,8 +20,7 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//*****************************************************************************
-#ifndef JZ_ALSATHRU_H
-#define JZ_ALSATHRU_H
+#pragma once
#include <stdlib.h>
#include <errno.h>
@@ -95,5 +94,3 @@
pid_t worker;
int running;
};
-
-#endif // !defined(JZ_ALSATHRU_H)
Modified: trunk/jazz/src/AudioDriver.h
===================================================================
--- trunk/jazz/src/AudioDriver.h 2013-01-07 15:32:52 UTC (rev 951)
+++ trunk/jazz/src/AudioDriver.h 2013-01-08 04:34:49 UTC (rev 952)
@@ -20,8 +20,7 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//*****************************************************************************
-#ifndef JZ_AUDIODRIVER_H
-#define JZ_AUDIODRIVER_H
+#pragma once
#include <sys/soundcard.h>
// in oss/free (from kernel 2.0.29) the following is not implemented
@@ -123,5 +122,3 @@
// Needed by buggy audio driver ...
int force_read;
};
-
-#endif // !define(JZ_AUDIODRIVER_H)
Modified: trunk/jazz/src/CommandUtilities.h
===================================================================
--- trunk/jazz/src/CommandUtilities.h 2013-01-07 15:32:52 UTC (rev 951)
+++ trunk/jazz/src/CommandUtilities.h 2013-01-08 04:34:49 UTC (rev 952)
@@ -18,8 +18,7 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//*****************************************************************************
-#ifndef JZ_COMMANDUTILITIES_H
-#define JZ_COMMANDUTILITIES_H
+#pragma once
//*****************************************************************************
//*****************************************************************************
@@ -29,6 +28,3 @@
eAddValues,
eSubtractValues
};
-
-
-#endif // !defined(JZ_COMMANDUTILITIES_H)
Modified: trunk/jazz/src/ResourceDialog.h
===================================================================
--- trunk/jazz/src/ResourceDialog.h 2013-01-07 15:32:52 UTC (rev 951)
+++ trunk/jazz/src/ResourceDialog.h 2013-01-08 04:34:49 UTC (rev 952)
@@ -20,8 +20,7 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//*****************************************************************************
-#ifndef JZ_RESOURCEDIALOG_H
-#define JZ_RESOURCEDIALOG_H
+#pragma once
#include <list>
@@ -245,5 +244,3 @@
/// The name of the dialog resource. Used in error reporting.
wxString dialogName;
};
-
-#endif // !defined(JZ_RESOURCEDIALOG_H)
Modified: trunk/jazz/src/SignalInterface.h
===================================================================
--- trunk/jazz/src/SignalInterface.h 2013-01-07 15:32:52 UTC (rev 951)
+++ trunk/jazz/src/SignalInterface.h 2013-01-08 04:34:49 UTC (rev 952)
@@ -20,8 +20,7 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//*****************************************************************************
-#ifndef JZ_SIGNALINTERFACE_H
-#define JZ_SIGNALINTERFACE_H
+#pragma once
class JZRndArray;
class JZSample;
@@ -87,5 +86,3 @@
JZOpFilter* filter;
float sr;
};
-
-#endif // !defined(JZ_SIGNALINTERFACE_H)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pst...@us...> - 2013-01-07 15:32:58
|
Revision: 951
http://sourceforge.net/p/jazzplusplus/code/951
Author: pstieber
Date: 2013-01-07 15:32:52 +0000 (Mon, 07 Jan 2013)
Log Message:
-----------
1. Changed header sentries to #pragma once.
2. Updated copyright years.
Modified Paths:
--------------
trunk/jazz/src/AboutDialog.cpp
trunk/jazz/src/AboutDialog.h
trunk/jazz/src/AsciiMidiFile.cpp
trunk/jazz/src/AsciiMidiFile.h
trunk/jazz/src/Audio.cpp
trunk/jazz/src/Audio.h
trunk/jazz/src/Command.cpp
trunk/jazz/src/Command.h
trunk/jazz/src/Configuration.cpp
trunk/jazz/src/Configuration.h
trunk/jazz/src/ControlEdit.cpp
trunk/jazz/src/ControlEdit.h
trunk/jazz/src/Dialogs/AudioSettingsDialog.h
trunk/jazz/src/Dialogs/CleanupDialog.cpp
trunk/jazz/src/Dialogs/CleanupDialog.h
trunk/jazz/src/Dialogs/ControllerDialog.h
trunk/jazz/src/Dialogs/DeleteDialog.cpp
trunk/jazz/src/Dialogs/DeleteDialog.h
trunk/jazz/src/Dialogs/EndOfTrackDialog.h
trunk/jazz/src/Dialogs/FilterDialog.cpp
trunk/jazz/src/Dialogs/FilterDialog.h
trunk/jazz/src/Dialogs/IntegerEdit.cpp
trunk/jazz/src/Dialogs/IntegerEdit.h
trunk/jazz/src/Dialogs/KeyOnDialog.cpp
trunk/jazz/src/Dialogs/KeyOnDialog.h
trunk/jazz/src/Dialogs/LengthDialog.cpp
trunk/jazz/src/Dialogs/LengthDialog.h
trunk/jazz/src/Dialogs/MeterChangeDialog.h
trunk/jazz/src/Dialogs/MetronomeSettingsDialog.cpp
trunk/jazz/src/Dialogs/MetronomeSettingsDialog.h
trunk/jazz/src/Dialogs/MidiChannelDialog.cpp
trunk/jazz/src/Dialogs/MidiChannelDialog.h
trunk/jazz/src/Dialogs/PitchWheelDialog.h
trunk/jazz/src/Dialogs/ProgramChangeDialog.h
trunk/jazz/src/Dialogs/QuantizeDialog.cpp
trunk/jazz/src/Dialogs/QuantizeDialog.h
trunk/jazz/src/Dialogs/SamplesDialog.h
trunk/jazz/src/Dialogs/SearchAndReplaceDialog.cpp
trunk/jazz/src/Dialogs/SearchAndReplaceDialog.h
trunk/jazz/src/Dialogs/SetTempoDialog.h
trunk/jazz/src/Dialogs/ShiftDialog.cpp
trunk/jazz/src/Dialogs/ShiftDialog.h
trunk/jazz/src/Dialogs/SnapDialog.cpp
trunk/jazz/src/Dialogs/SnapDialog.h
trunk/jazz/src/Dialogs/SynthesizerSettingsDialog.cpp
trunk/jazz/src/Dialogs/SynthesizerSettingsDialog.h
trunk/jazz/src/Dialogs/SysexDialog.cpp
trunk/jazz/src/Dialogs/SysexDialog.h
trunk/jazz/src/Dialogs/TextDialog.h
trunk/jazz/src/Dialogs/TrackDialog.cpp
trunk/jazz/src/Dialogs/TrackDialog.h
trunk/jazz/src/Dialogs/TransposeDialog.cpp
trunk/jazz/src/Dialogs/TransposeDialog.h
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/DynamicArray.cpp
trunk/jazz/src/DynamicArray.h
trunk/jazz/src/ErrorMessage.cpp
trunk/jazz/src/ErrorMessage.h
trunk/jazz/src/EventFrame.cpp
trunk/jazz/src/EventFrame.h
trunk/jazz/src/EventWindow.cpp
trunk/jazz/src/EventWindow.h
trunk/jazz/src/Events.cpp
trunk/jazz/src/Events.h
trunk/jazz/src/FileSelector.cpp
trunk/jazz/src/FileSelector.h
trunk/jazz/src/Filter.cpp
trunk/jazz/src/Filter.h
trunk/jazz/src/FindFile.cpp
trunk/jazz/src/FindFile.h
trunk/jazz/src/FrequencyTable.cpp
trunk/jazz/src/FrequencyTable.h
trunk/jazz/src/GetOptionIndex.h
trunk/jazz/src/Globals.cpp
trunk/jazz/src/Globals.h
trunk/jazz/src/GuitarFrame.cpp
trunk/jazz/src/GuitarFrame.h
trunk/jazz/src/GuitarSettings.cpp
trunk/jazz/src/GuitarSettings.h
trunk/jazz/src/GuitarSettingsDialog.cpp
trunk/jazz/src/GuitarSettingsDialog.h
trunk/jazz/src/GuitarWindow.cpp
trunk/jazz/src/GuitarWindow.h
trunk/jazz/src/Harmony.cpp
trunk/jazz/src/Harmony.h
trunk/jazz/src/HarmonyBrowserAnalyzer.cpp
trunk/jazz/src/HarmonyBrowserAnalyzer.h
trunk/jazz/src/HarmonyP.cpp
trunk/jazz/src/HarmonyP.h
trunk/jazz/src/Help.cpp
trunk/jazz/src/Help.h
trunk/jazz/src/JazzPlusPlusApplication.cpp
trunk/jazz/src/JazzPlusPlusApplication.h
trunk/jazz/src/KeyStringConverters.cpp
trunk/jazz/src/KeyStringConverters.h
trunk/jazz/src/Knob.cpp
trunk/jazz/src/Knob.h
trunk/jazz/src/Mapper.cpp
trunk/jazz/src/Mapper.h
trunk/jazz/src/MeasureChoice.cpp
trunk/jazz/src/MeasureChoice.h
trunk/jazz/src/Metronome.cpp
trunk/jazz/src/Metronome.h
trunk/jazz/src/MidiDeviceDialog.cpp
trunk/jazz/src/MidiDeviceDialog.h
trunk/jazz/src/MouseAction.cpp
trunk/jazz/src/MouseAction.h
trunk/jazz/src/NamedChoice.cpp
trunk/jazz/src/NamedChoice.h
trunk/jazz/src/NamedValue.cpp
trunk/jazz/src/NamedValue.h
trunk/jazz/src/NamedValueChoice.cpp
trunk/jazz/src/NamedValueChoice.h
trunk/jazz/src/PianoFrame.cpp
trunk/jazz/src/PianoFrame.h
trunk/jazz/src/PianoWindow.cpp
trunk/jazz/src/PianoWindow.h
trunk/jazz/src/Player.cpp
trunk/jazz/src/Player.h
trunk/jazz/src/PortMidiPlayer.h
trunk/jazz/src/Project.cpp
trunk/jazz/src/Project.h
trunk/jazz/src/ProjectManager.h
trunk/jazz/src/PropertyListDialog.cpp
trunk/jazz/src/PropertyListDialog.h
trunk/jazz/src/Random.cpp
trunk/jazz/src/Random.h
trunk/jazz/src/RecordingInfo.cpp
trunk/jazz/src/RecordingInfo.h
trunk/jazz/src/Rectangle.cpp
trunk/jazz/src/Rectangle.h
trunk/jazz/src/Resources.h
trunk/jazz/src/Rhythm.cpp
trunk/jazz/src/Rhythm.h
trunk/jazz/src/Sample.cpp
trunk/jazz/src/Sample.h
trunk/jazz/src/SampleCommand.cpp
trunk/jazz/src/SampleCommand.h
trunk/jazz/src/SampleDialog.cpp
trunk/jazz/src/SampleDialog.h
trunk/jazz/src/SampleFrame.h
trunk/jazz/src/SampleWindow.cpp
trunk/jazz/src/SampleWindow.h
trunk/jazz/src/SelectControllerDialog.cpp
trunk/jazz/src/SelectControllerDialog.h
trunk/jazz/src/Signal2.cpp
trunk/jazz/src/Signal2.h
trunk/jazz/src/SliderWindow.cpp
trunk/jazz/src/SliderWindow.h
trunk/jazz/src/Song.cpp
trunk/jazz/src/Song.h
trunk/jazz/src/StandardFile.cpp
trunk/jazz/src/StandardFile.h
trunk/jazz/src/StringReadWrite.cpp
trunk/jazz/src/StringReadWrite.h
trunk/jazz/src/StringUtilities.cpp
trunk/jazz/src/StringUtilities.h
trunk/jazz/src/Synth.cpp
trunk/jazz/src/Synth.h
trunk/jazz/src/ToolBar.cpp
trunk/jazz/src/ToolBar.h
trunk/jazz/src/Track.cpp
trunk/jazz/src/Track.h
trunk/jazz/src/TrackFrame.cpp
trunk/jazz/src/TrackFrame.h
trunk/jazz/src/TrackWindow.cpp
trunk/jazz/src/TrackWindow.h
trunk/jazz/src/mswin/WindowsAudioInterface.cpp
trunk/jazz/src/mswin/WindowsAudioInterface.h
trunk/jazz/src/mswin/WindowsConsole.cpp
trunk/jazz/src/mswin/WindowsConsole.h
trunk/jazz/src/mswin/WindowsMidiInterface.cpp
trunk/jazz/src/mswin/WindowsMidiInterface.h
trunk/jazz/src/mswin/WindowsPlayer.cpp
trunk/jazz/src/mswin/WindowsPlayer.h
Modified: trunk/jazz/src/AboutDialog.cpp
===================================================================
--- trunk/jazz/src/AboutDialog.cpp 2013-01-07 05:35:32 UTC (rev 950)
+++ trunk/jazz/src/AboutDialog.cpp 2013-01-07 15:32:52 UTC (rev 951)
@@ -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-2010 Peter J. Stieber
+// Modifications Copyright (C) 2008-2013 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
Modified: trunk/jazz/src/AboutDialog.h
===================================================================
--- trunk/jazz/src/AboutDialog.h 2013-01-07 05:35:32 UTC (rev 950)
+++ trunk/jazz/src/AboutDialog.h 2013-01-07 15:32:52 UTC (rev 951)
@@ -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-2010 Peter J. Stieber
+// Modifications Copyright (C) 2008-2013 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
@@ -20,8 +20,7 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//*****************************************************************************
-#ifndef JZ_ABOUTDIALOG_H
-#define JZ_ABOUTDIALOG_H
+#pragma once
#include <wx/dialog.h>
@@ -52,5 +51,3 @@
DECLARE_EVENT_TABLE()
};
-
-#endif // !defined(JZ_ABOUTDIALOG_H)
Modified: trunk/jazz/src/AsciiMidiFile.cpp
===================================================================
--- trunk/jazz/src/AsciiMidiFile.cpp 2013-01-07 05:35:32 UTC (rev 950)
+++ trunk/jazz/src/AsciiMidiFile.cpp 2013-01-07 15:32:52 UTC (rev 951)
@@ -2,7 +2,7 @@
// The JAZZ++ Midi Sequencer
//
// Copyright (C) 1994-2000 Andreas Voss and Per Sigmond, all rights reserved.
-// Modifications Copyright (C) 2008-2010 Peter J. Stieber
+// Modifications Copyright (C) 2008-2013 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
Modified: trunk/jazz/src/AsciiMidiFile.h
===================================================================
--- trunk/jazz/src/AsciiMidiFile.h 2013-01-07 05:35:32 UTC (rev 950)
+++ trunk/jazz/src/AsciiMidiFile.h 2013-01-07 15:32:52 UTC (rev 951)
@@ -2,7 +2,7 @@
// The JAZZ++ Midi Sequencer
//
// Copyright (C) 1994-2000 Andreas Voss and Per Sigmond, all rights reserved.
-// Modifications Copyright (C) 2008-2010 Peter J. Stieber
+// Modifications Copyright (C) 2008-2013 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
@@ -19,8 +19,7 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//*****************************************************************************
-#ifndef JZ_ASCIIMIDIFILE_H
-#define JZ_ASCIIMIDIFILE_H
+#pragma once
#include "Events.h"
@@ -52,6 +51,3 @@
virtual void NextTrack();
};
-
-
-#endif // !defined(JZ_ASCIIMIDIFILE_H)
Modified: trunk/jazz/src/Audio.cpp
===================================================================
--- trunk/jazz/src/Audio.cpp 2013-01-07 05:35:32 UTC (rev 950)
+++ trunk/jazz/src/Audio.cpp 2013-01-07 15:32:52 UTC (rev 951)
@@ -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-2010 Peter J. Stieber
+// Modifications Copyright (C) 2008-2013 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
Modified: trunk/jazz/src/Audio.h
===================================================================
--- trunk/jazz/src/Audio.h 2013-01-07 05:35:32 UTC (rev 950)
+++ trunk/jazz/src/Audio.h 2013-01-07 15:32:52 UTC (rev 951)
@@ -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-2010 Peter J. Stieber
+// Modifications Copyright (C) 2008-2013 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
@@ -20,8 +20,7 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//*****************************************************************************
-#ifndef JZ_AUDIO_H
-#define JZ_AUDIO_H
+#pragma once
#include "DynamicArray.h"
#include "Project.h"
@@ -466,5 +465,3 @@
{
return mFullBuffers;
}
-
-#endif // !defined(JZ_AUDIO_H)
Modified: trunk/jazz/src/Command.cpp
===================================================================
--- trunk/jazz/src/Command.cpp 2013-01-07 05:35:32 UTC (rev 950)
+++ trunk/jazz/src/Command.cpp 2013-01-07 15:32:52 UTC (rev 951)
@@ -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-2010 Peter J. Stieber
+// Modifications Copyright (C) 2008-2013 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
Modified: trunk/jazz/src/Command.h
===================================================================
--- trunk/jazz/src/Command.h 2013-01-07 05:35:32 UTC (rev 950)
+++ trunk/jazz/src/Command.h 2013-01-07 15:32:52 UTC (rev 951)
@@ -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-2010 Peter J. Stieber
+// Modifications Copyright (C) 2008-2013 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
@@ -20,8 +20,7 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//*****************************************************************************
-#ifndef JZ_COMMAND_H
-#define JZ_COMMAND_H
+#pragma once
#include "CommandUtilities.h"
@@ -367,5 +366,3 @@
JZBarInfo* mpBarInfo;
JZRndArray& mRandomArray;
};
-
-#endif // !defined(JZ_COMMAND_H)
Modified: trunk/jazz/src/Configuration.cpp
===================================================================
--- trunk/jazz/src/Configuration.cpp 2013-01-07 05:35:32 UTC (rev 950)
+++ trunk/jazz/src/Configuration.cpp 2013-01-07 15:32:52 UTC (rev 951)
@@ -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-2010 Peter J. Stieber
+// Modifications Copyright (C) 2008-2013 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
Modified: trunk/jazz/src/Configuration.h
===================================================================
--- trunk/jazz/src/Configuration.h 2013-01-07 05:35:32 UTC (rev 950)
+++ trunk/jazz/src/Configuration.h 2013-01-07 15:32:52 UTC (rev 951)
@@ -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-2010 Peter J. Stieber
+// Modifications Copyright (C) 2008-2013 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
@@ -20,8 +20,7 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//*****************************************************************************
-#ifndef JZ_CONFIGURATION_H
-#define JZ_CONFIGURATION_H
+#pragma once
#include <string>
#include <vector>
@@ -334,5 +333,3 @@
{
return mVoiceNames;
}
-
-#endif // !defined(JZ_CONFIGURATION_H)
Modified: trunk/jazz/src/ControlEdit.cpp
===================================================================
--- trunk/jazz/src/ControlEdit.cpp 2013-01-07 05:35:32 UTC (rev 950)
+++ trunk/jazz/src/ControlEdit.cpp 2013-01-07 15:32:52 UTC (rev 951)
@@ -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-2010 Peter J. Stieber
+// Modifications Copyright (C) 2008-2013 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
Modified: trunk/jazz/src/ControlEdit.h
===================================================================
--- trunk/jazz/src/ControlEdit.h 2013-01-07 05:35:32 UTC (rev 950)
+++ trunk/jazz/src/ControlEdit.h 2013-01-07 15:32:52 UTC (rev 951)
@@ -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-2010 Peter J. Stieber
+// Modifications Copyright (C) 2008-2013 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
@@ -20,8 +20,7 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//*****************************************************************************
-#ifndef JZ_CONTROLEDIT_H
-#define JZ_CONTROLEDIT_H
+#pragma once
#include "Random.h"
@@ -278,5 +277,3 @@
virtual int GetValue(JZEvent *e);
virtual JZEvent * NewEvent(long clock, int val);
};
-
-#endif // !defined(JZ_CONTROLEDIT_H)
Modified: trunk/jazz/src/Dialogs/AudioSettingsDialog.h
===================================================================
--- trunk/jazz/src/Dialogs/AudioSettingsDialog.h 2013-01-07 05:35:32 UTC (rev 950)
+++ trunk/jazz/src/Dialogs/AudioSettingsDialog.h 2013-01-07 15:32:52 UTC (rev 951)
@@ -18,8 +18,7 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//*****************************************************************************
-#ifndef JZ_AUDIOSETTINGSDIALOG_H
-#define JZ_AUDIOSETTINGSDIALOG_H
+#pragma once
#include <wx/dialog.h>
@@ -44,5 +43,3 @@
wxCheckBox* mpStereoCheckBox;
wxCheckBox* mpSoftwareMidiAudioSyncCheckBox;
};
-
-#endif // !defined(JZ_AUDIOSETTINGSDIALOG_H)
Modified: trunk/jazz/src/Dialogs/CleanupDialog.cpp
===================================================================
--- trunk/jazz/src/Dialogs/CleanupDialog.cpp 2013-01-07 05:35:32 UTC (rev 950)
+++ trunk/jazz/src/Dialogs/CleanupDialog.cpp 2013-01-07 15:32:52 UTC (rev 951)
@@ -1,7 +1,7 @@
//*****************************************************************************
// The JAZZ++ Midi Sequencer
//
-// Copyright (C) 2009-2010 Peter J. Stieber, all rights reserved.
+// Copyright (C) 2009-2013 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
Modified: trunk/jazz/src/Dialogs/CleanupDialog.h
===================================================================
--- trunk/jazz/src/Dialogs/CleanupDialog.h 2013-01-07 05:35:32 UTC (rev 950)
+++ trunk/jazz/src/Dialogs/CleanupDialog.h 2013-01-07 15:32:52 UTC (rev 951)
@@ -1,7 +1,7 @@
//*****************************************************************************
// The JAZZ++ Midi Sequencer
//
-// Copyright (C) 2009-2010 Peter J. Stieber, all rights reserved.
+// Copyright (C) 2009-2013 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
@@ -18,8 +18,7 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//*****************************************************************************
-#ifndef JZ_CLEANUPDIALOG_H
-#define JZ_CLEANUPDIALOG_H
+#pragma once
#include <wx/dialog.h>
@@ -57,5 +56,3 @@
DECLARE_EVENT_TABLE();
};
-
-#endif // !defined(JZ_CLEANUPDIALOG_H)
Modified: trunk/jazz/src/Dialogs/ControllerDialog.h
===================================================================
--- trunk/jazz/src/Dialogs/ControllerDialog.h 2013-01-07 05:35:32 UTC (rev 950)
+++ trunk/jazz/src/Dialogs/ControllerDialog.h 2013-01-07 15:32:52 UTC (rev 951)
@@ -18,10 +18,8 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//*****************************************************************************
-#ifndef JZ_CONTROLLERDIALOG_H
-#define JZ_CONTROLLERDIALOG_H
+#pragma once
-
#include <wx/dialog.h>
class JZControlEvent;
@@ -47,5 +45,3 @@
DECLARE_EVENT_TABLE();
};
-
-#endif // !defined(JZ_CONTROLLERDIALOG_H)
Modified: trunk/jazz/src/Dialogs/DeleteDialog.cpp
===================================================================
--- trunk/jazz/src/Dialogs/DeleteDialog.cpp 2013-01-07 05:35:32 UTC (rev 950)
+++ trunk/jazz/src/Dialogs/DeleteDialog.cpp 2013-01-07 15:32:52 UTC (rev 951)
@@ -1,7 +1,7 @@
//*****************************************************************************
// The JAZZ++ Midi Sequencer
//
-// Copyright (C) 2009-2010 Peter J. Stieber, all rights reserved.
+// Copyright (C) 2009-2013 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
Modified: trunk/jazz/src/Dialogs/DeleteDialog.h
===================================================================
--- trunk/jazz/src/Dialogs/DeleteDialog.h 2013-01-07 05:35:32 UTC (rev 950)
+++ trunk/jazz/src/Dialogs/DeleteDialog.h 2013-01-07 15:32:52 UTC (rev 951)
@@ -1,7 +1,7 @@
//*****************************************************************************
// The JAZZ++ Midi Sequencer
//
-// Copyright (C) 2009-2010 Peter J. Stieber, all rights reserved.
+// Copyright (C) 2009-2013 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
@@ -18,8 +18,7 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//*****************************************************************************
-#ifndef JZ_DELETEDIALOG_H
-#define JZ_DELETEDIALOG_H
+#pragma once
#include <wx/dialog.h>
@@ -49,5 +48,3 @@
DECLARE_EVENT_TABLE();
};
-
-#endif // !defined(JZ_DELETEDIALOG_H)
Modified: trunk/jazz/src/Dialogs/EndOfTrackDialog.h
===================================================================
--- trunk/jazz/src/Dialogs/EndOfTrackDialog.h 2013-01-07 05:35:32 UTC (rev 950)
+++ trunk/jazz/src/Dialogs/EndOfTrackDialog.h 2013-01-07 15:32:52 UTC (rev 951)
@@ -18,8 +18,7 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//*****************************************************************************
-#ifndef JZ_ENDOFTRACKDIALOG_H
-#define JZ_ENDOFTRACKDIALOG_H
+#pragma once
#include <wx/dialog.h>
@@ -54,5 +53,3 @@
DECLARE_EVENT_TABLE();
};
-
-#endif // !defined(JZ_ENDOFTRACKDIALOG_H)
Modified: trunk/jazz/src/Dialogs/FilterDialog.cpp
===================================================================
--- trunk/jazz/src/Dialogs/FilterDialog.cpp 2013-01-07 05:35:32 UTC (rev 950)
+++ trunk/jazz/src/Dialogs/FilterDialog.cpp 2013-01-07 15:32:52 UTC (rev 951)
@@ -1,7 +1,7 @@
//*****************************************************************************
// The JAZZ++ Midi Sequencer
//
-// Copyright (C) 2008-2010 Peter J. Stieber, all rights reserved.
+// Copyright (C) 2008-2013 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
Modified: trunk/jazz/src/Dialogs/FilterDialog.h
===================================================================
--- trunk/jazz/src/Dialogs/FilterDialog.h 2013-01-07 05:35:32 UTC (rev 950)
+++ trunk/jazz/src/Dialogs/FilterDialog.h 2013-01-07 15:32:52 UTC (rev 951)
@@ -1,7 +1,7 @@
//*****************************************************************************
// The JAZZ++ Midi Sequencer
//
-// Copyright (C) 2008-2010 Peter J. Stieber, all rights reserved.
+// Copyright (C) 2008-2013 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
@@ -18,8 +18,7 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//*****************************************************************************
-#ifndef JZ_FILTERDIALOG_H
-#define JZ_FILTERDIALOG_H
+#pragma once
#include <wx/dialog.h>
@@ -84,6 +83,3 @@
DECLARE_EVENT_TABLE();
};
-
-
-#endif // !defined(JZ_FILTERDIALOG_H)
Modified: trunk/jazz/src/Dialogs/IntegerEdit.cpp
===================================================================
--- trunk/jazz/src/Dialogs/IntegerEdit.cpp 2013-01-07 05:35:32 UTC (rev 950)
+++ trunk/jazz/src/Dialogs/IntegerEdit.cpp 2013-01-07 15:32:52 UTC (rev 951)
@@ -1,7 +1,7 @@
//*****************************************************************************
// The JAZZ++ Midi Sequencer
//
-// Copyright (C) 2008-2010 Peter J. Stieber, all rights reserved.
+// Copyright (C) 2008-2013 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
Modified: trunk/jazz/src/Dialogs/IntegerEdit.h
===================================================================
--- trunk/jazz/src/Dialogs/IntegerEdit.h 2013-01-07 05:35:32 UTC (rev 950)
+++ trunk/jazz/src/Dialogs/IntegerEdit.h 2013-01-07 15:32:52 UTC (rev 951)
@@ -1,7 +1,7 @@
//*****************************************************************************
// The JAZZ++ Midi Sequencer
//
-// Copyright (C) 2008-2010 Peter J. Stieber, all rights reserved.
+// Copyright (C) 2008-2013 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
Modified: trunk/jazz/src/Dialogs/KeyOnDialog.cpp
===================================================================
--- trunk/jazz/src/Dialogs/KeyOnDialog.cpp 2013-01-07 05:35:32 UTC (rev 950)
+++ trunk/jazz/src/Dialogs/KeyOnDialog.cpp 2013-01-07 15:32:52 UTC (rev 951)
@@ -1,7 +1,7 @@
//*****************************************************************************
// The JAZZ++ Midi Sequencer
//
-// Copyright (C) 2008-2010 Peter J. Stieber, all rights reserved.
+// Copyright (C) 2008-2013 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
Modified: trunk/jazz/src/Dialogs/KeyOnDialog.h
===================================================================
--- trunk/jazz/src/Dialogs/KeyOnDialog.h 2013-01-07 05:35:32 UTC (rev 950)
+++ trunk/jazz/src/Dialogs/KeyOnDialog.h 2013-01-07 15:32:52 UTC (rev 951)
@@ -1,7 +1,7 @@
//*****************************************************************************
// The JAZZ++ Midi Sequencer
//
-// Copyright (C) 2008-2010 Peter J. Stieber, all rights reserved.
+// Copyright (C) 2008-2013 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
@@ -18,8 +18,7 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//*****************************************************************************
-#ifndef JZ_KEYONDIALOG_H
-#define JZ_KEYONDIALOG_H
+#pragma once
#include <wx/dialog.h>
@@ -68,5 +67,3 @@
DECLARE_EVENT_TABLE();
};
-
-#endif // !defined(JZ_KEYONDIALOG_H)
Modified: trunk/jazz/src/Dialogs/LengthDialog.cpp
===================================================================
--- trunk/jazz/src/Dialogs/LengthDialog.cpp 2013-01-07 05:35:32 UTC (rev 950)
+++ trunk/jazz/src/Dialogs/LengthDialog.cpp 2013-01-07 15:32:52 UTC (rev 951)
@@ -1,7 +1,7 @@
//*****************************************************************************
// The JAZZ++ Midi Sequencer
//
-// Copyright (C) 2009-2010 Peter J. Stieber, all rights reserved.
+// Copyright (C) 2009-2013 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
Modified: trunk/jazz/src/Dialogs/LengthDialog.h
===================================================================
--- trunk/jazz/src/Dialogs/LengthDialog.h 2013-01-07 05:35:32 UTC (rev 950)
+++ trunk/jazz/src/Dialogs/LengthDialog.h 2013-01-07 15:32:52 UTC (rev 951)
@@ -1,7 +1,7 @@
//*****************************************************************************
// The JAZZ++ Midi Sequencer
//
-// Copyright (C) 2009-2010 Peter J. Stieber, all rights reserved.
+// Copyright (C) 2009-2013 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
@@ -18,8 +18,7 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//*****************************************************************************
-#ifndef JZ_LENGTHDIALOG_H
-#define JZ_LENGTHDIALOG_H
+#pragma once
#include "../CommandUtilities.h"
@@ -70,5 +69,3 @@
DECLARE_EVENT_TABLE();
};
-
-#endif // !defined(JZ_LENGTHDIALOG_H)
Modified: trunk/jazz/src/Dialogs/MeterChangeDialog.h
===================================================================
--- trunk/jazz/src/Dialogs/MeterChangeDialog.h 2013-01-07 05:35:32 UTC (rev 950)
+++ trunk/jazz/src/Dialogs/MeterChangeDialog.h 2013-01-07 15:32:52 UTC (rev 951)
@@ -18,8 +18,7 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//*****************************************************************************
-#ifndef JZ_METERCHANGEDIALOG_H
-#define JZ_METERCHANGEDIALOG_H
+#pragma once
#include <wx/dialog.h>
@@ -45,5 +44,3 @@
DECLARE_EVENT_TABLE();
};
-
-#endif // !defined(JZ_METERCHANGEDIALOG_H)
Modified: trunk/jazz/src/Dialogs/MetronomeSettingsDialog.cpp
===================================================================
--- trunk/jazz/src/Dialogs/MetronomeSettingsDialog.cpp 2013-01-07 05:35:32 UTC (rev 950)
+++ trunk/jazz/src/Dialogs/MetronomeSettingsDialog.cpp 2013-01-07 15:32:52 UTC (rev 951)
@@ -1,7 +1,7 @@
//*****************************************************************************
// The JAZZ++ Midi Sequencer
//
-// Copyright (C) 2008-2010 Peter J. Stieber, all rights reserved.
+// Copyright (C) 2008-2013 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
Modified: trunk/jazz/src/Dialogs/MetronomeSettingsDialog.h
===================================================================
--- trunk/jazz/src/Dialogs/MetronomeSettingsDialog.h 2013-01-07 05:35:32 UTC (rev 950)
+++ trunk/jazz/src/Dialogs/MetronomeSettingsDialog.h 2013-01-07 15:32:52 UTC (rev 951)
@@ -1,7 +1,7 @@
//*****************************************************************************
// The JAZZ++ Midi Sequencer
//
-// Copyright (C) 2008-2010 Peter J. Stieber, all rights reserved.
+// Copyright (C) 2008-2013 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
@@ -18,8 +18,7 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//*****************************************************************************
-#ifndef JZ_METRONOMESETTINGDIALOG_H
-#define JZ_METRONOMESETTINGDIALOG_H
+#pragma once
#include <wx/dialog.h>
@@ -80,5 +79,3 @@
DECLARE_EVENT_TABLE();
};
-
-#endif // !defined(JZ_METRONOMESETTINGDIALOG_H)
Modified: trunk/jazz/src/Dialogs/MidiChannelDialog.cpp
===================================================================
--- trunk/jazz/src/Dialogs/MidiChannelDialog.cpp 2013-01-07 05:35:32 UTC (rev 950)
+++ trunk/jazz/src/Dialogs/MidiChannelDialog.cpp 2013-01-07 15:32:52 UTC (rev 951)
@@ -1,7 +1,7 @@
//*****************************************************************************
// The JAZZ++ Midi Sequencer
//
-// Copyright (C) 2009-2010 Peter J. Stieber, all rights reserved.
+// Copyright (C) 2009-2013 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
Modified: trunk/jazz/src/Dialogs/MidiChannelDialog.h
===================================================================
--- trunk/jazz/src/Dialogs/MidiChannelDialog.h 2013-01-07 05:35:32 UTC (rev 950)
+++ trunk/jazz/src/Dialogs/MidiChannelDialog.h 2013-01-07 15:32:52 UTC (rev 951)
@@ -1,7 +1,7 @@
//*****************************************************************************
// The JAZZ++ Midi Sequencer
//
-// Copyright (C) 2009-2010 Peter J. Stieber, all rights reserved.
+// Copyright (C) 2009-2013 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
@@ -18,8 +18,7 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//*****************************************************************************
-#ifndef JZ_MIDICHANNELDIALOG_H
-#define JZ_MIDICHANNELDIALOG_H
+#pragma once
#include <wx/dialog.h>
@@ -54,5 +53,3 @@
DECLARE_EVENT_TABLE();
};
-
-#endif // !defined(JZ_MIDICHANNELDIALOG_H)
Modified: trunk/jazz/src/Dialogs/PitchWheelDialog.h
===================================================================
--- trunk/jazz/src/Dialogs/PitchWheelDialog.h 2013-01-07 05:35:32 UTC (rev 950)
+++ trunk/jazz/src/Dialogs/PitchWheelDialog.h 2013-01-07 15:32:52 UTC (rev 951)
@@ -18,8 +18,7 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//*****************************************************************************
-#ifndef JZ_PITCHWHEELDIALOG_H
-#define JZ_PITCHWHEELDIALOG_H
+#pragma once
class JZPitchEvent;
class JZTrack;
@@ -49,5 +48,3 @@
DECLARE_EVENT_TABLE();
};
-
-#endif // !defined(JZ_PITCHWHEELDIALOG_H)
Modified: trunk/jazz/src/Dialogs/ProgramChangeDialog.h
===================================================================
--- trunk/jazz/src/Dialogs/ProgramChangeDialog.h 2013-01-07 05:35:32 UTC (rev 950)
+++ trunk/jazz/src/Dialogs/ProgramChangeDialog.h 2013-01-07 15:32:52 UTC (rev 951)
@@ -18,8 +18,7 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//*****************************************************************************
-#ifndef JZ_PROGRAMCHANGEDIALOG_H
-#define JZ_PROGRAMCHANGEDIALOG_H
+#pragma once
#include <wx/dialog.h>
@@ -46,5 +45,3 @@
DECLARE_EVENT_TABLE();
};
-
-#endif // !defined(JZ_PROGRAMCHANGEDIALOG_H)
Modified: trunk/jazz/src/Dialogs/QuantizeDialog.cpp
===================================================================
--- trunk/jazz/src/Dialogs/QuantizeDialog.cpp 2013-01-07 05:35:32 UTC (rev 950)
+++ trunk/jazz/src/Dialogs/QuantizeDialog.cpp 2013-01-07 15:32:52 UTC (rev 951)
@@ -1,7 +1,7 @@
//*****************************************************************************
// The JAZZ++ Midi Sequencer
//
-// Copyright (C) 2009-2010 Peter J. Stieber, all rights reserved.
+// Copyright (C) 2009-2013 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
Modified: trunk/jazz/src/Dialogs/QuantizeDialog.h
===================================================================
--- trunk/jazz/src/Dialogs/QuantizeDialog.h 2013-01-07 05:35:32 UTC (rev 950)
+++ trunk/jazz/src/Dialogs/QuantizeDialog.h 2013-01-07 15:32:52 UTC (rev 951)
@@ -1,7 +1,7 @@
//*****************************************************************************
// The JAZZ++ Midi Sequencer
//
-// Copyright (C) 2009-2010 Peter J. Stieber, all rights reserved.
+// Copyright (C) 2009-2013 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
@@ -18,8 +18,7 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//*****************************************************************************
-#ifndef JZ_QUANTIZEDIALOG_H
-#define JZ_QUANTIZEDIALOG_H
+#pragma once
#include <wx/dialog.h>
@@ -73,5 +72,3 @@
DECLARE_EVENT_TABLE();
};
-
-#endif // !defined(JZ_QUANTIZEDIALOG_H)
Modified: trunk/jazz/src/Dialogs/SamplesDialog.h
===================================================================
--- trunk/jazz/src/Dialogs/SamplesDialog.h 2013-01-07 05:35:32 UTC (rev 950)
+++ trunk/jazz/src/Dialogs/SamplesDialog.h 2013-01-07 15:32:52 UTC (rev 951)
@@ -18,8 +18,7 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//*****************************************************************************
-#ifndef JZ_SAMPLESDIALOG_H
-#define JZ_SAMPLESDIALOG_H
+#pragma once
#include <wx/dialog.h>
@@ -57,5 +56,3 @@
DECLARE_EVENT_TABLE()
};
-
-#endif // !defined(JZ_SAMPLESDIALOG_H)
Modified: trunk/jazz/src/Dialogs/SearchAndReplaceDialog.cpp
===================================================================
--- trunk/jazz/src/Dialogs/SearchAndReplaceDialog.cpp 2013-01-07 05:35:32 UTC (rev 950)
+++ trunk/jazz/src/Dialogs/SearchAndReplaceDialog.cpp 2013-01-07 15:32:52 UTC (rev 951)
@@ -1,7 +1,7 @@
//*****************************************************************************
// The JAZZ++ Midi Sequencer
//
-// Copyright (C) 2009-2010 Peter J. Stieber, all rights reserved.
+// Copyright (C) 2009-2013 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
Modified: trunk/jazz/src/Dialogs/SearchAndReplaceDialog.h
===================================================================
--- trunk/jazz/src/Dialogs/SearchAndReplaceDialog.h 2013-01-07 05:35:32 UTC (rev 950)
+++ trunk/jazz/src/Dialogs/SearchAndReplaceDialog.h 2013-01-07 15:32:52 UTC (rev 951)
@@ -1,7 +1,7 @@
//*****************************************************************************
// The JAZZ++ Midi Sequencer
//
-// Copyright (C) 2009-2010 Peter J. Stieber, all rights reserved.
+// Copyright (C) 2009-2013 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
@@ -18,8 +18,7 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//*****************************************************************************
-#ifndef JZ_SEARCHANDREPLACEDIALOG_H
-#define JZ_SEARCHANDREPLACEDIALOG_H
+#pragma once
#include <wx/dialog.h>
@@ -47,5 +46,3 @@
DECLARE_EVENT_TABLE();
};
-
-#endif // !defined(JZ_SEARCHANDREPLACEDIALOG_H)
Modified: trunk/jazz/src/Dialogs/SetTempoDialog.h
===================================================================
--- trunk/jazz/src/Dialogs/SetTempoDialog.h 2013-01-07 05:35:32 UTC (rev 950)
+++ trunk/jazz/src/Dialogs/SetTempoDialog.h 2013-01-07 15:32:52 UTC (rev 951)
@@ -18,8 +18,7 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//*****************************************************************************
-#ifndef JZ_SETTEMPODIALOG_H
-#define JZ_SETTEMPODIALOG_H
+#pragma once
#include <wx/dialog.h>
@@ -57,5 +56,3 @@
DECLARE_EVENT_TABLE();
};
-
-#endif // !defined(JZ_SETTEMPODIALOG_H)
Modified: trunk/jazz/src/Dialogs/ShiftDialog.cpp
===================================================================
--- trunk/jazz/src/Dialogs/ShiftDialog.cpp 2013-01-07 05:35:32 UTC (rev 950)
+++ trunk/jazz/src/Dialogs/ShiftDialog.cpp 2013-01-07 15:32:52 UTC (rev 951)
@@ -1,7 +1,7 @@
//*****************************************************************************
// The JAZZ++ Midi Sequencer
//
-// Copyright (C) 2008-2010 Peter J. Stieber, all rights reserved.
+// Copyright (C) 2008-2013 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
Modified: trunk/jazz/src/Dialogs/ShiftDialog.h
===================================================================
--- trunk/jazz/src/Dialogs/ShiftDialog.h 2013-01-07 05:35:32 UTC (rev 950)
+++ trunk/jazz/src/Dialogs/ShiftDialog.h 2013-01-07 15:32:52 UTC (rev 951)
@@ -1,7 +1,7 @@
//*****************************************************************************
// The JAZZ++ Midi Sequencer
//
-// Copyright (C) 2008-2010 Peter J. Stieber, all rights reserved.
+// Copyright (C) 2008-2013 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
@@ -18,8 +18,7 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//*****************************************************************************
-#ifndef JZ_SHIFTDIALOG_H
-#define JZ_SHIFTDIALOG_H
+#pragma once
#include <wx/dialog.h>
@@ -61,5 +60,3 @@
DECLARE_EVENT_TABLE();
};
-
-#endif // !defined(JZ_SHIFTDIALOG_H)
Modified: trunk/jazz/src/Dialogs/SnapDialog.cpp
===================================================================
--- trunk/jazz/src/Dialogs/SnapDialog.cpp 2013-01-07 05:35:32 UTC (rev 950)
+++ trunk/jazz/src/Dialogs/SnapDialog.cpp 2013-01-07 15:32:52 UTC (rev 951)
@@ -1,7 +1,7 @@
//*****************************************************************************
// The JAZZ++ Midi Sequencer
//
-// Copyright (C) 2009-2010 Peter J. Stieber, all rights reserved.
+// Copyright (C) 2009-2013 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
Modified: trunk/jazz/src/Dialogs/SnapDialog.h
===================================================================
--- trunk/jazz/src/Dialogs/SnapDialog.h 2013-01-07 05:35:32 UTC (rev 950)
+++ trunk/jazz/src/Dialogs/SnapDialog.h 2013-01-07 15:32:52 UTC (rev 951)
@@ -1,7 +1,7 @@
//*****************************************************************************
// The JAZZ++ Midi Sequencer
//
-// Copyright (C) 2009-2010 Peter J. Stieber, all rights reserved.
+// Copyright (C) 2009-2013 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
@@ -18,8 +18,7 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//*****************************************************************************
-#ifndef JZ_SNAPDIALOG_H
-#define JZ_SNAPDIALOG_H
+#pragma once
#include <wx/dialog.h>
@@ -49,5 +48,3 @@
DECLARE_EVENT_TABLE();
};
-
-#endif // !defined(JZ_SNAPDIALOG_H)
Modified: trunk/jazz/src/Dialogs/SynthesizerSettingsDialog.cpp
===================================================================
--- trunk/jazz/src/Dialogs/SynthesizerSettingsDialog.cpp 2013-01-07 05:35:32 UTC (rev 950)
+++ trunk/jazz/src/Dialogs/SynthesizerSettingsDialog.cpp 2013-01-07 15:32:52 UTC (rev 951)
@@ -1,7 +1,7 @@
//*****************************************************************************
// The JAZZ++ Midi Sequencer
//
-// Copyright (C) 2008-2010 Peter J. Stieber, all rights reserved.
+// Copyright (C) 2008-2013 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
Modified: trunk/jazz/src/Dialogs/SynthesizerSettingsDialog.h
===================================================================
--- trunk/jazz/src/Dialogs/SynthesizerSettingsDialog.h 2013-01-07 05:35:32 UTC (rev 950)
+++ trunk/jazz/src/Dialogs/SynthesizerSettingsDialog.h 2013-01-07 15:32:52 UTC (rev 951)
@@ -1,7 +1,7 @@
//*****************************************************************************
// The JAZZ++ Midi Sequencer
//
-// Copyright (C) 2008-2010 Peter J. Stieber, all rights reserved.
+// Copyright (C) 2008-2013 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
@@ -18,8 +18,7 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//*****************************************************************************
-#ifndef JZ_SYNTHESIZERSETTINGDIALOG_H
-#define JZ_SYNTHESIZERSETTINGDIALOG_H
+#pragma once
#include <wx/dialog.h>
@@ -53,5 +52,3 @@
DECLARE_EVENT_TABLE();
};
-
-#endif // !defined(JZ_SYNTHESIZERSETTINGDIALOG_H)
Modified: trunk/jazz/src/Dialogs/SysexDialog.cpp
===================================================================
--- trunk/jazz/src/Dialogs/SysexDialog.cpp 2013-01-07 05:35:32 UTC (rev 950)
+++ trunk/jazz/src/Dialogs/SysexDialog.cpp 2013-01-07 15:32:52 UTC (rev 951)
@@ -1,7 +1,7 @@
//*****************************************************************************
// The JAZZ++ Midi Sequencer
//
-// Copyright (C) 2009-2010 Peter J. Stieber, all rights reserved.
+// Copyright (C) 2009-2013 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
Modified: trunk/jazz/src/Dialogs/SysexDialog.h
===================================================================
--- trunk/jazz/src/Dialogs/SysexDialog.h 2013-01-07 05:35:32 UTC (rev 950)
+++ trunk/jazz/src/Dialogs/SysexDialog.h 2013-01-07 15:32:52 UTC (rev 951)
@@ -1,7 +1,7 @@
//*****************************************************************************
// The JAZZ++ Midi Sequencer
//
-// Copyright (C) 2009-2010 Peter J. Stieber, all rights reserved.
+// Copyright (C) 2009-2013 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
@@ -18,8 +18,7 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//*****************************************************************************
-#ifndef JZ_SYSEXDIALOG_H
-#define JZ_SYSEXDIALOG_H
+#pragma once
#include <wx/dialog.h>
@@ -58,5 +57,3 @@
DECLARE_EVENT_TABLE();
};
-
-#endif // !defined(JZ_SYSEXDIALOG_H)
Modified: trunk/jazz/src/Dialogs/TextDialog.h
===================================================================
--- trunk/jazz/src/Dialogs/TextDialog.h 2013-01-07 05:35:32 UTC (rev 950)
+++ trunk/jazz/src/Dialogs/TextDialog.h 2013-01-07 15:32:52 UTC (rev 951)
@@ -18,8 +18,7 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//*****************************************************************************
-#ifndef JZ_TEXTDIALOG_H
-#define JZ_TEXTDIALOG_H
+#pragma once
#include <wx/dialog.h>
@@ -52,5 +51,3 @@
DECLARE_EVENT_TABLE();
};
-
-#endif // !defined(JZ_TEXTDIALOG_H)
Modified: trunk/jazz/src/Dialogs/TrackDialog.cpp
===================================================================
--- trunk/jazz/src/Dialogs/TrackDialog.cpp 2013-01-07 05:35:32 UTC (rev 950)
+++ trunk/jazz/src/Dialogs/TrackDialog.cpp 2013-01-07 15:32:52 UTC (rev 951)
@@ -1,7 +1,7 @@
//*****************************************************************************
// The JAZZ++ Midi Sequencer
//
-// Copyright (C) 2008-2010 Peter J. Stieber, all rights reserved.
+// Copyright (C) 2008-2013 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
Modified: trunk/jazz/src/Dialogs/TrackDialog.h
===================================================================
--- trunk/jazz/src/Dialogs/TrackDialog.h 2013-01-07 05:35:32 UTC (rev 950)
+++ trunk/jazz/src/Dialogs/TrackDialog.h 2013-01-07 15:32:52 UTC (rev 951)
@@ -1,7 +1,7 @@
//*****************************************************************************
// The JAZZ++ Midi Sequencer
//
-// Copyright (C) 2008-2010 Peter J. Stieber, all rights reserved.
+// Copyright (C) 2008-2013 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
@@ -18,8 +18,7 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//*****************************************************************************
-#ifndef JZ_TRACKDIALOG_H
-#define JZ_TRACKDIALOG_H
+#pragma once
#include <wx/dialog.h>
@@ -69,5 +68,3 @@
DECLARE_EVENT_TABLE();
};
-
-#endif // !defined(JZ_TRACKDIALOG_H)
Modified: trunk/jazz/src/Dialogs/TransposeDialog.cpp
===================================================================
--- trunk/jazz/src/Dialogs/TransposeDialog.cpp 2013-01-07 05:35:32 UTC (rev 950)
+++ trunk/jazz/src/Dialogs/TransposeDialog.cpp 2013-01-07 15:32:52 UTC (rev 951)
@@ -1,7 +1,7 @@
//*****************************************************************************
// The JAZZ++ Midi Sequencer
//
-// Copyright (C) 2009-2010 Peter J. Stieber, all rights reserved.
+// Copyright (C) 2009-2013 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
Modified: trunk/jazz/src/Dialogs/TransposeDialog.h
===================================================================
--- trunk/jazz/src/Dialogs/TransposeDialog.h 2013-01-07 05:35:32 UTC (rev 950)
+++ trunk/jazz/src/Dialogs/TransposeDialog.h 2013-01-07 15:32:52 UTC (rev 951)
@@ -1,7 +1,7 @@
//*****************************************************************************
// The JAZZ++ Midi Sequencer
//
-// Copyright (C) 2009-2010 Peter J. Stieber, all rights reserved.
+// Copyright (C) 2009-2013 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
@@ -18,8 +18,7 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//*****************************************************************************
-#ifndef JZ_TRANSPOSEDIALOG_H
-#define JZ_TRANSPOSEDIALOG_H
+#pragma once
#include <wx/dialog.h>
@@ -65,5 +64,3 @@
DECLARE_EVENT_TABLE();
};
-
-#endif // !defined(JZ_TRANSPOSEDIALOG_H)
Modified: trunk/jazz/src/Dialogs/VelocityDialog.cpp
===================================================================
--- trunk/jazz/src/Dialogs/VelocityDialog.cpp 2013-01-07 05:35:32 UTC (rev 950)
+++ trunk/jazz/src/Dialogs/VelocityDialog.cpp 2013-01-07 15:32:52 UTC (rev 951)
@@ -1,7 +1,7 @@
//*****************************************************************************
// The JAZZ++ Midi Sequencer
//
-// Copyright (C) 2009-2010 Peter J. Stieber, all rights reserved.
+// Copyright (C) 2009-2013 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
Modified: trunk/jazz/src/Dialogs/VelocityDialog.h
===================================================================
--- trunk/jazz/src/Dialogs/VelocityDialog.h 2013-01-07 05:35:32 UTC (rev 950)
+++ trunk/jazz/src/Dialogs/VelocityDialog.h 2013-01-07 15:32:52 UTC (rev 951)
@@ -1,7 +1,7 @@
//*****************************************************************************
// The JAZZ++ Midi Sequencer
//
-// Copyright (C) 2009-2010 Peter J. Stieber, all rights reserved.
+// Copyright (C) 2009-2013 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
@@ -18,8 +18,7 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//*****************************************************************************
-#ifndef JZ_VELOCITYDIALOG_H
-#define JZ_VELOCITYDIALOG_H
+#pragma once
#include "../CommandUtilities.h"
@@ -69,5 +68,3 @@
DECLARE_EVENT_TABLE();
};
-
-#endif // !defined(JZ_VELOCITYDIALOG_H)
Modified: trunk/jazz/src/Dialogs.cpp
===================================================================
--- trunk/jazz/src/Dialogs.cpp 2013-01-07 05:35:32 UTC (rev 950)
+++ trunk/jazz/src/Dialogs.cpp 2013-01-07 15:32:52 UTC (rev 951)
@@ -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-2010 Peter J. Stieber
+// Modifications Copyright (C) 2008-2013 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
Modified: trunk/jazz/src/Dialogs.h
===================================================================
--- trunk/jazz/src/Dialogs.h 2013-01-07 05:35:32 UTC (rev 950)
+++ trunk/jazz/src/Dialogs.h 2013-01-07 15:32:52 UTC (rev 951)
@@ -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-2010 Peter J. Stieber
+// Modifications Copyright (C) 2008-2013 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
@@ -20,8 +20,7 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//*****************************************************************************
-#ifndef JZ_DIALOGS_H
-#define JZ_DIALOGS_H
+#pragma once
#if 0
#include "CommandUtilities.h"
@@ -114,5 +113,3 @@
long Clock,
int Channel,
int Pitch);
-
-#endif // !defined(JZ_DIALOGS_H)
Modified: trunk/jazz/src/DynamicArray.cpp
===================================================================
--- trunk/jazz/src/DynamicArray.cpp 2013-01-07 05:35:32 UTC (rev 950)
+++ trunk/jazz/src/DynamicArray.cpp 2013-01-07 15:32:52 UTC (rev 951)
@@ -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-2010 Peter J. Stieber
+// Modifications Copyright (C) 2008-2013 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
Modified: trunk/jazz/src/DynamicArray.h
===================================================================
--- trunk/jazz/src/DynamicArray.h 2013-01-07 05:35:32 UTC (rev 950)
+++ trunk/jazz/src/DynamicArray.h 2013-01-07 15:32:52 UTC (rev 951)
@@ -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-2010 Peter J. Stieber
+// Modifications Copyright (C) 2008-2013 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
@@ -20,8 +20,7 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//*****************************************************************************
-#ifndef JZ_DYNAMICARRAY_H
-#define JZ_DYNAMICARRAY_H
+#pragma once
#include <assert.h>
@@ -226,7 +225,4 @@
}
};
-
DECLARE_ARRAY(JZVoidPtrArray, void *)
-
-#endif // !defined(JZ_DYNAMICARRAY_H)
Modified: trunk/jazz/src/ErrorMessage.cpp
===================================================================
--- trunk/jazz/src/ErrorMessage.cpp 2013-01-07 05:35:32 UTC (rev 950)
+++ trunk/jazz/src/ErrorMessage.cpp 2013-01-07 15:32:52 UTC (rev 951)
@@ -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-2010 Peter J. Stieber
+// Modifications Copyright (C) 2008-2013 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
Modified: trunk/jazz/src/ErrorMessage.h
===================================================================
--- trunk/jazz/src/ErrorMessage.h 2013-01-07 05:35:32 UTC (rev 950)
+++ trunk/jazz/src/ErrorMessage.h 2013-01-07 15:32:52 UTC (rev 951)
@@ -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-2010 Peter J. Stieber
+// Modifications Copyright (C) 2008-2013 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
@@ -20,13 +20,10 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//*****************************************************************************
-#ifndef JZ_ERRORMESSAGE_H
-#define JZ_ERRORMESSAGE_H
+#pragma once
#include <string>
//*****************************************************************************
//*****************************************************************************
void Error(const std::string& ErrorMessage);
-
-#endif // !defined(JZ_ERRORMESSAGE_H)
Modified: trunk/jazz/src/EventFrame.cpp
===================================================================
--- trunk/jazz/src/EventFrame.cpp 2013-01-07 05:35:32 UTC (rev 950)
+++ trunk/jazz/src/EventFrame.cpp 2013-01-07 15:32:52 UTC (rev 951)
@@ -1,7 +1,7 @@
//*****************************************************************************
// The JAZZ++ Midi Sequencer
//
-// Copyright (C) 2009-2010 Peter J. Stieber, all rights reserved.
+// Copyright (C) 2009-2013 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
Modified: trunk/jazz/src/EventFrame.h
===================================================================
--- trunk/jazz/src/EventFrame.h 2013-01-07 05:35:32 UTC (rev 950)
+++ trunk/jazz/src/EventFrame.h 2013-01-07 15:32:52 UTC (rev 951)
@@ -1,7 +1,7 @@
//*****************************************************************************
// The JAZZ++ Midi Sequencer
//
-// Copyright (C) 2009-2010 Peter J. Stieber, all rights reserved.
+// Copyright (C) 2009-2013 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
@@ -18,8 +18,7 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//*****************************************************************************
-#ifndef JZ_EVENTFRAME_H
-#define JZ_EVENTFRAME_H
+#pragma once
#include <wx/frame.h>
@@ -93,5 +92,3 @@
DECLARE_EVENT_TABLE()
};
-
-#endif // !defined(JZ_EVENTFRAME_H)
Modified: trunk/jazz/src/EventWindow.cpp
===================================================================
--- trunk/jazz/src/EventWindow.cpp 2013-01-07 05:35:32 UTC (rev 950)
+++ trunk/jazz/src/EventWindow.cpp 2013-01-07 15:32:52 UTC (rev 951)
@@ -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-2010 Peter J. Stieber
+// Modifications Copyright (C) 2008-2013 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
Modified: trunk/jazz/src/EventWindow.h
===================================================================
--- trunk/jazz/src/EventWindow.h 2013-01-07 05:35:32 UTC (rev 950)
+++ trunk/jazz/src/EventWindow.h 2013-01-07 15:32:52 UTC (rev 951)
@@ -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-2010 Peter J. Stieber
+// Modifications Copyright (C) 2008-2013 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
@@ -20,8 +20,7 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//*****************************************************************************
-#ifndef JZ_EVENTWINDOW_H
-#define JZ_EVENTWINDOW_H
+#pragma once
#include <wx/window.h>
@@ -161,5 +160,3 @@
{
return mpProject;
}
-
-#endif // !defined(JZ_EVENTWINDOW_H)
Modified: trunk/jazz/src/Events.cpp
=============...
[truncated message content] |
|
From: <pst...@us...> - 2013-01-07 05:35:35
|
Revision: 950
http://sourceforge.net/p/jazzplusplus/code/950
Author: pstieber
Date: 2013-01-07 05:35:32 +0000 (Mon, 07 Jan 2013)
Log Message:
-----------
Added a define to enable ALSA.
Modified Paths:
--------------
trunk/jazz/codeblocks/Jazz++.cbp
Modified: trunk/jazz/codeblocks/Jazz++.cbp
===================================================================
--- trunk/jazz/codeblocks/Jazz++.cbp 2013-01-07 05:32:57 UTC (rev 949)
+++ trunk/jazz/codeblocks/Jazz++.cbp 2013-01-07 05:35:32 UTC (rev 950)
@@ -37,8 +37,9 @@
</Target>
</Build>
<Compiler>
+ <Add option="-Wall" />
<Add option="`wx-config --cflags`" />
- <Add option="-Wall" />
+ <Add option="-DDEV_ALSA" />
</Compiler>
<Linker>
<Add option="`wx-config --libs`" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pst...@us...> - 2013-01-07 05:32:59
|
Revision: 949
http://sourceforge.net/p/jazzplusplus/code/949
Author: pstieber
Date: 2013-01-07 05:32:57 +0000 (Mon, 07 Jan 2013)
Log Message:
-----------
Fixed configuration file path handling.
Modified Paths:
--------------
trunk/jazz/src/Project.cpp
Modified: trunk/jazz/src/Project.cpp
===================================================================
--- trunk/jazz/src/Project.cpp 2013-01-07 05:31:29 UTC (rev 948)
+++ trunk/jazz/src/Project.cpp 2013-01-07 05:32:57 UTC (rev 949)
@@ -394,7 +394,10 @@
ConfigurationFilePath.clear();
if (FindAndRegisterConfFilePath(ConfigurationFilePath))
{
- JazzCfgFile = ConfigurationFilePath + mConfFileName;
+ JazzCfgFile =
+ ConfigurationFilePath +
+ wxFileName::GetPathSeparator() +
+ mConfFileName;
// Try one more time.
if (!::wxFileExists(JazzCfgFile))
@@ -452,7 +455,6 @@
// Generate a c-style string that contains a path to the help file.
wxString TempConfFilePath;
TempConfFilePath = ::wxPathOnly(OpenDialog.GetPath());
- TempConfFilePath += ::wxFileName::GetPathSeparator();
wxConfigBase* pConfig = wxConfigBase::Get();
if (pConfig)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pst...@us...> - 2013-01-07 05:31:32
|
Revision: 948
http://sourceforge.net/p/jazzplusplus/code/948
Author: pstieber
Date: 2013-01-07 05:31:29 +0000 (Mon, 07 Jan 2013)
Log Message:
-----------
Made myself the lead developer.
Modified Paths:
--------------
trunk/jazz/src/AboutDialog.cpp
Modified: trunk/jazz/src/AboutDialog.cpp
===================================================================
--- trunk/jazz/src/AboutDialog.cpp 2013-01-07 05:11:25 UTC (rev 947)
+++ trunk/jazz/src/AboutDialog.cpp 2013-01-07 05:31:29 UTC (rev 948)
@@ -113,11 +113,11 @@
"<table border=0>"
"<tr>"
- "<td>Patrick Earl</td>"
- "<td>" + "Lead Developer and SVN gatekeeper" + "</td>"
+ "<td>Pete Stieber</td>"
+ "<td>" + "Lead Developer" + "</td>"
"</tr>"
"<tr>"
- "<td>Pete Stieber</td>"
+ "<td>Patrick Earl</td>"
"<td>" + "Developer" + "</td>"
"</tr>"
"<tr>"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pst...@us...> - 2013-01-07 05:11:29
|
Revision: 947
http://sourceforge.net/p/jazzplusplus/code/947
Author: pstieber
Date: 2013-01-07 05:11:25 +0000 (Mon, 07 Jan 2013)
Log Message:
-----------
Wrapped cout code with DEBUG_ALSA tests.
Modified Paths:
--------------
trunk/jazz/src/AlsaPlayer.cpp
Modified: trunk/jazz/src/AlsaPlayer.cpp
===================================================================
--- trunk/jazz/src/AlsaPlayer.cpp 2013-01-07 01:24:06 UTC (rev 946)
+++ trunk/jazz/src/AlsaPlayer.cpp 2013-01-07 05:11:25 UTC (rev 947)
@@ -596,7 +596,9 @@
// called by timer
int Now = GetRealTimeClock();
+#ifdef DEBUG_ALSA
cout << "JZAlsaPlayer::Notify " << Now << ' ' << play_clock << endl;
+#endif // DEBUG_ALSA
if (Now < 0)
{
@@ -607,7 +609,9 @@
{
// rewind..
// clear and rebuild
+#ifdef DEBUG_ALSA
cout << "JZAlsaPlayer::Notify rewind" << endl;
+#endif // DEBUG_ALSA
ResetPlay(Now);
mPlayBuffer.Clear();
mOutClock = Now + FIRST_DELTACLOCK;
@@ -831,10 +835,12 @@
{
JZEvent* pEvent = 0;
+#ifdef DEBUG_ALSA
cout
<< "JZAlsaPlayer::recd_event got " << (int)ev->type
<< " (echo is " << SND_SEQ_EVENT_ECHO << ')'
<< endl;
+#endif // DEBUG_ALSA
switch (ev->type)
{
@@ -917,7 +923,9 @@
else
{
recd_clock = ev->time.tick;
+#ifdef DEBUG_ALSA
cout << "recd_clock now: " << recd_clock << endl;
+#endif // DEBUG_ALSA
}
break;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pst...@us...> - 2013-01-07 01:24:09
|
Revision: 946
http://sourceforge.net/p/jazzplusplus/code/946
Author: pstieber
Date: 2013-01-07 01:24:06 +0000 (Mon, 07 Jan 2013)
Log Message:
-----------
Updated the comments.
Modified Paths:
--------------
trunk/jazz/conf/Makefile.am
Modified: trunk/jazz/conf/Makefile.am
===================================================================
--- trunk/jazz/conf/Makefile.am 2013-01-07 00:54:35 UTC (rev 945)
+++ trunk/jazz/conf/Makefile.am 2013-01-07 01:24:06 UTC (rev 946)
@@ -1,6 +1,4 @@
-## Process this file with automake to produce Makefile.in
-
-# This files specifies Jazz++ data files to install. The default location on
+# This file specifies Jazz++ data files to install. The default location on
# a Linux box is /usr/local/share/Jazz++, which is the gnu dictated place for
# such files. jazz.cfg could be tailored after the configure options (make a
# jazz.cfg.in and use var substitution).
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pst...@us...> - 2013-01-07 00:54:38
|
Revision: 945
http://sourceforge.net/p/jazzplusplus/code/945
Author: pstieber
Date: 2013-01-07 00:54:35 +0000 (Mon, 07 Jan 2013)
Log Message:
-----------
Added new source modules.
Modified Paths:
--------------
trunk/jazz/codeblocks/Jazz++.cbp
Modified: trunk/jazz/codeblocks/Jazz++.cbp
===================================================================
--- trunk/jazz/codeblocks/Jazz++.cbp 2013-01-07 00:53:17 UTC (rev 944)
+++ trunk/jazz/codeblocks/Jazz++.cbp 2013-01-07 00:54:35 UTC (rev 945)
@@ -125,6 +125,9 @@
<Unit filename="../src/Dialogs/TransposeDialog.h" />
<Unit filename="../src/Dialogs/VelocityDialog.cpp" />
<Unit filename="../src/Dialogs/VelocityDialog.h" />
+ <Unit filename="../src/DrumEnums.h" />
+ <Unit filename="../src/DrumUtilities.cpp" />
+ <Unit filename="../src/DrumUtilities.h" />
<Unit filename="../src/DynamicArray.cpp" />
<Unit filename="../src/DynamicArray.h" />
<Unit filename="../src/ErrorMessage.cpp" />
@@ -232,6 +235,8 @@
<Unit filename="../src/StringUtilities.h" />
<Unit filename="../src/Synth.cpp" />
<Unit filename="../src/Synth.h" />
+ <Unit filename="../src/SysexChannel.cpp" />
+ <Unit filename="../src/SysexChannel.h" />
<Unit filename="../src/ToolBar.cpp" />
<Unit filename="../src/ToolBar.h" />
<Unit filename="../src/Track.cpp" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pst...@us...> - 2013-01-07 00:53:20
|
Revision: 944
http://sourceforge.net/p/jazzplusplus/code/944
Author: pstieber
Date: 2013-01-07 00:53:17 +0000 (Mon, 07 Jan 2013)
Log Message:
-----------
Updated code to find jazz.cfg.
Modified Paths:
--------------
trunk/jazz/src/Project.cpp
Modified: trunk/jazz/src/Project.cpp
===================================================================
--- trunk/jazz/src/Project.cpp 2013-01-06 22:53:47 UTC (rev 943)
+++ trunk/jazz/src/Project.cpp 2013-01-07 00:53:17 UTC (rev 944)
@@ -365,10 +365,24 @@
//-----------------------------------------------------------------------------
void JZProject::ReadConfiguration()
{
- wxString ConfigDir = wxStandardPaths::Get().GetUserDataDir();
+ wxConfigBase* pConfig = wxConfigBase::Get();
+ wxString ConfigurationFilePathGuess =
+ wxStandardPaths::Get().GetUserDataDir();
+
+ // Attempt to obtain the path to the help file from configuration data.
+ wxString ConfigurationFilePath;
+ if (pConfig)
+ {
+ pConfig->Read(
+ "/Paths/Conf",
+ &ConfigurationFilePath,
+ ConfigurationFilePathGuess);
+ }
+
+ // Construct a full file name.
wxString JazzCfgFile =
- ConfigDir +
+ ConfigurationFilePath +
wxFileName::GetPathSeparator() +
mConfFileName;
@@ -377,10 +391,10 @@
if (!::wxFileExists(JazzCfgFile))
{
// Return a valid path to the data.
- wxString ConfFilePath;
- if (FindAndRegisterConfFilePath(ConfFilePath))
+ ConfigurationFilePath.clear();
+ if (FindAndRegisterConfFilePath(ConfigurationFilePath))
{
- JazzCfgFile = ConfFilePath + mConfFileName;
+ JazzCfgFile = ConfigurationFilePath + mConfFileName;
// Try one more time.
if (!::wxFileExists(JazzCfgFile))
@@ -400,11 +414,6 @@
if (ConfigurationFileFound)
{
- cout
- << "JZProject::ReadConfiguration() JazzCfgFile:" << '\n'
- << " \"" << JazzCfgFile << '"'
- << endl;
-
mpConfig->LoadConfig(JazzCfgFile);
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
