Menu
▾
▴
SF.net SVN: jazzplusplus: [431] trunk/jazz
|
From: <pst...@us...> - 2008-04-06 23:58:34
|
Revision: 431
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=431&view=rev
Author: pstieber
Date: 2008-04-06 16:58:31 -0700 (Sun, 06 Apr 2008)
Log Message:
-----------
Removed white space from the ends of lines.
Modified Paths:
--------------
trunk/jazz/contrib/CakeWalk-Converter/jazzconvert.cpp
trunk/jazz/doc/jazz.tex
trunk/jazz/midinetd/main.c
trunk/jazz/midinetd/reader.c
trunk/jazz/src/AboutDialog.cpp
trunk/jazz/src/AlsaPlayer.h
trunk/jazz/src/AlsaThru.cpp
trunk/jazz/src/Audio.h
trunk/jazz/src/ClockDialog.cpp
trunk/jazz/src/Command.cpp
trunk/jazz/src/Configuration.cpp
trunk/jazz/src/ControlEdit.cpp
trunk/jazz/src/DeprecatedWx/proplist.cpp
trunk/jazz/src/Dialogs.h
trunk/jazz/src/EventWindow.cpp
trunk/jazz/src/EventWindow.h
trunk/jazz/src/Events.h
trunk/jazz/src/FileSelector.cpp
trunk/jazz/src/FindFile.cpp
trunk/jazz/src/FindFile.h
trunk/jazz/src/Harmony.cpp
trunk/jazz/src/Harmony.h
trunk/jazz/src/KeyDialog.cpp
trunk/jazz/src/MouseAction.cpp
trunk/jazz/src/PianoFrame.cpp
trunk/jazz/src/PianoWindow.cpp
trunk/jazz/src/Player.cpp
trunk/jazz/src/Player.h
trunk/jazz/src/Project.cpp
trunk/jazz/src/PropertyListDialog.h
trunk/jazz/src/ResourceDialog.cpp
trunk/jazz/src/Sample.cpp
trunk/jazz/src/SampleDialog.cpp
trunk/jazz/src/SliderWindow.cpp
trunk/jazz/src/Song.cpp
trunk/jazz/src/Track.cpp
trunk/jazz/src/TrackWindow.cpp
Modified: trunk/jazz/contrib/CakeWalk-Converter/jazzconvert.cpp
===================================================================
--- trunk/jazz/contrib/CakeWalk-Converter/jazzconvert.cpp 2008-04-06 23:00:36 UTC (rev 430)
+++ trunk/jazz/contrib/CakeWalk-Converter/jazzconvert.cpp 2008-04-06 23:58:31 UTC (rev 431)
@@ -7,7 +7,7 @@
#define FALSE 0
#define TRUE 1
-enum sections
+enum sections
{
none,
patchNames,
@@ -16,7 +16,7 @@
instrumentDefinitions
};
-void trimend(char *t)
+void trimend(char *t)
{
char *x = t + strlen(t) - 1;
@@ -27,7 +27,7 @@
}
}
-int countPatches(char *fname)
+int countPatches(char *fname)
{
FILE *f = fopen(fname, "r");
@@ -38,11 +38,11 @@
bzero(t, 80);
fgets(t, 79, f); trimend(t);
- while (!feof(f))
+ while (!feof(f))
{
- if (strncmp(t, ".Patch Names", 12) == 0)
+ if (strncmp(t, ".Patch Names", 12) == 0)
patches = TRUE;
- else if (t[0] == '.')
+ else if (t[0] == '.')
patches = FALSE;
else if (patches && isdigit(t[0]))
ret++;
@@ -54,9 +54,9 @@
return ret;
}
-int main(int argc, char *argv[])
+int main(int argc, char *argv[])
{
- if (argc != 2)
+ if (argc != 2)
{
cerr << "Usage: " << argv[0] << " cakewalkfile.ins\n";
exit(-1);
@@ -76,26 +76,26 @@
int numpatches = countPatches(argv[1]);
fgets(t, 255, inf); trimend(t);
- while (!feof(inf))
+ while (!feof(inf))
{
- if (t[0] == ';')
+ if (t[0] == ';')
{ // Comment line, change first character only
t[0] = '#';
fprintf(outf, "%s\n", t);
}
- else if (strlen(t) == 1)
+ else if (strlen(t) == 1)
{ // Blank line, don't change at all
fprintf(outf, "\n");
- }
+ }
else if (t[0] == '[')
{
switch (currentSection)
{
case (patchNames):
// New bank
- if (b_programs != 0)
+ if (b_programs != 0)
{
- cout << "\no Processed " << b_programs
+ cout << "\no Processed " << b_programs
<< " programs.\n\n";
}
cout << "o Reading bank " << t << " (#" << ++bank
@@ -106,15 +106,15 @@
break;
}
}
- else if (strncmp(t, ".Patch Names", 12) == 0)
+ else if (strncmp(t, ".Patch Names", 12) == 0)
{ // Patch names directive
- fprintf(outf, ".max_voice_names %d\n",
+ fprintf(outf, ".max_voice_names %d\n",
numpatches);
fprintf(outf, ".voicenames\n");
currentSection = patchNames;
}
else if (strncmp(t, ".Note Names", 11) == 0)
- { // Note names section
+ { // Note names section
fprintf(outf, ".drumnames\n");
currentSection = noteNames;
@@ -134,16 +134,16 @@
char *tok;
int patchnum, controllernumber, notenum;
- switch (currentSection)
+ switch (currentSection)
{
case (patchNames):
tok = strtok(t, "=\n");
patchnum = atoi(tok);
tok = strtok(NULL, "=\n");
fprintf(outf, "%d %s %d %s\n",
- (bank * 256 + patchnum),
+ (bank * 256 + patchnum),
bankname, patchnum, tok);
- printf("o \t%d %s\n", patchnum, tok);
+ printf("o \t%d %s\n", patchnum, tok);
b_programs++; t_programs++;
break;
case (controllerNames):
Modified: trunk/jazz/doc/jazz.tex
===================================================================
--- trunk/jazz/doc/jazz.tex 2008-04-06 23:00:36 UTC (rev 430)
+++ trunk/jazz/doc/jazz.tex 2008-04-06 23:58:31 UTC (rev 431)
@@ -120,7 +120,7 @@
\section{Copyright}\label{copyright}
-The JAZZ++ MIDI Sequencer is copyright (C) 1994-2000 Andreas Voss and
+The JAZZ++ MIDI Sequencer is copyright (C) 1994-2000 Andreas Voss and
Per Sigmond, all rights reserved.
JAZZ++ program is free software; you can redistribute it and/or modify
@@ -1527,8 +1527,8 @@
text in the Event List Editor and finally convert it back to midi events.
The Event List Editor allows to filter events. The Editor will show only those
-events that are currently enabled in the \helpref{Filter Dialog}{midifilter}
-in the Settings menu. As we already know, changing the filter settings
+events that are currently enabled in the \helpref{Filter Dialog}{midifilter}
+in the Settings menu. As we already know, changing the filter settings
affects most of the other edit functions too, e.g erase will erase only
those events, that are enabled in the Filter Dialog.
@@ -1536,7 +1536,7 @@
\begin{itemize}
\item {\tt 1:2:030 key 1 4C 90 200}\\
- A note event. 1:2:030 is the timing information, it means bar 1,
+ A note event. 1:2:030 is the timing information, it means bar 1,
beat 2 plus 30 ticks. The string key indicates that this line
corresponds to a note on event. The following 1 is the midi channel
(numbered from 1 to 16), 4C is the octave and pitch, 90
@@ -1559,7 +1559,7 @@
A pitchbend event, valid values are in -8191 .. 8191
\item {\tt 1:2:030 sys f0 11 22 33 44 f7}\\
- A system exclusive message, hex values including the start-
+ A system exclusive message, hex values including the start-
(f0) and stop- (f7) byte.
\item {\tt 1:2:030 txt here is some text}\\
Modified: trunk/jazz/midinetd/main.c
===================================================================
--- trunk/jazz/midinetd/main.c 2008-04-06 23:00:36 UTC (rev 430)
+++ trunk/jazz/midinetd/main.c 2008-04-06 23:58:31 UTC (rev 431)
@@ -138,7 +138,7 @@
printerror("bind");
exit(1);
}
-
+
/* Issue listen-command */
if (listen(sd1,5) < 0) {
printerror("listen");
@@ -149,7 +149,7 @@
/* (hangs until call arrives) */
fprintf(stderr,"Start accepting\n");
tcp_sd = accept(sd1,(struct sockaddr*) remote_tcp_addr_ptr,addlen_ptr);
-
+
if (tcp_sd < 0) {
printerror("accept");
exit(1);
Modified: trunk/jazz/midinetd/reader.c
===================================================================
--- trunk/jazz/midinetd/reader.c 2008-04-06 23:00:36 UTC (rev 430)
+++ trunk/jazz/midinetd/reader.c 2008-04-06 23:58:31 UTC (rev 431)
@@ -143,7 +143,7 @@
written to the midi device.
On play/record stop JAZZ will send one byte through the TCP-connection
as a command and will wait for the function to send the recorded midi data
- through the TCP-connection. This will be caught by the select-statement.
+ through the TCP-connection. This will be caught by the select-statement.
After sending the record buffer the function will clear the buffer and
allocate a new one.
@@ -210,7 +210,7 @@
for (k = 0; k < filebytes; k++) {
ch = filebuf[k];
if (ch == 0xff) continue;
- /* I sometimes get these 0xff bytes,
+ /* I sometimes get these 0xff bytes,
don't know why but they are of no use */
/* clock-to-host received ? */
Modified: trunk/jazz/src/AboutDialog.cpp
===================================================================
--- trunk/jazz/src/AboutDialog.cpp 2008-04-06 23:00:36 UTC (rev 430)
+++ trunk/jazz/src/AboutDialog.cpp 2008-04-06 23:58:31 UTC (rev 431)
@@ -83,7 +83,7 @@
// wxString Paragraph2String = "Jazz++ is a MIDI sequencer program.";
- wxString HtmlString =
+ wxString HtmlString =
"<html>"
"<head><META http-equiv=\"Content-Type\" content=\"text/html; charset=" +
LocaleString + "\"></head>"
Modified: trunk/jazz/src/AlsaPlayer.h
===================================================================
--- trunk/jazz/src/AlsaPlayer.h 2008-04-06 23:00:36 UTC (rev 430)
+++ trunk/jazz/src/AlsaPlayer.h 2008-04-06 23:58:31 UTC (rev 431)
@@ -76,7 +76,7 @@
int inp_dev, outp_dev; // input/output device index
int sync_in, sync_in_dev, sync_in_mtcType;
int sync_out, sync_out_dev, sync_out_mtcType;
-
+
int installed;
static int create_port(snd_seq_t *handle, const char *name);
Modified: trunk/jazz/src/AlsaThru.cpp
===================================================================
--- trunk/jazz/src/AlsaThru.cpp 2008-04-06 23:00:36 UTC (rev 430)
+++ trunk/jazz/src/AlsaThru.cpp 2008-04-06 23:58:31 UTC (rev 431)
@@ -50,8 +50,8 @@
#include "AlsaPlayer.h"
/*
-** midi thru for alsa. it creates a new process (because threads dont work
-** with wxwin) that copies from input to output.
+** midi thru for alsa. it creates a new process (because threads dont work
+** with wxwin) that copies from input to output.
*/
tAlsaThru::tAlsaThru()
@@ -158,7 +158,7 @@
// thread version
-void tAlsaThru::stopworker(int sig)
+void tAlsaThru::stopworker(int sig)
{
running = 0;
snd_seq_close(handle);
@@ -176,7 +176,7 @@
return 0;
}
-void tAlsaThru::Start()
+void tAlsaThru::Start()
{
if (!running)
pthread_create(&worker, (void *)0, startworker, (void *)this);
@@ -185,7 +185,7 @@
void tAlsaThru::Stop()
{
if (running)
- pthread_kill(worker, SIGHUP);
+ pthread_kill(worker, SIGHUP);
}
@@ -196,13 +196,13 @@
static snd_seq_t *static_handle; // ugly!!
-void tAlsaThru::stopworker(int sig)
+void tAlsaThru::stopworker(int sig)
{
snd_seq_close(static_handle);
exit(0);
}
-void tAlsaThru::Start()
+void tAlsaThru::Start()
{
if (!running) {
worker = fork();
Modified: trunk/jazz/src/Audio.h
===================================================================
--- trunk/jazz/src/Audio.h 2008-04-06 23:00:36 UTC (rev 430)
+++ trunk/jazz/src/Audio.h 2008-04-06 23:58:31 UTC (rev 431)
@@ -245,7 +245,7 @@
void Edit(int key);
- int GetSpeed() const
+ int GetSpeed() const
{
return speed;
}
Modified: trunk/jazz/src/ClockDialog.cpp
===================================================================
--- trunk/jazz/src/ClockDialog.cpp 2008-04-06 23:00:36 UTC (rev 430)
+++ trunk/jazz/src/ClockDialog.cpp 2008-04-06 23:58:31 UTC (rev 431)
@@ -57,7 +57,7 @@
return new wxProperty(
mpTitle,
wxPropertyValue((char**)&mpString),
- "string");
+ "string");
}
//-----------------------------------------------------------------------------
Modified: trunk/jazz/src/Command.cpp
===================================================================
--- trunk/jazz/src/Command.cpp 2008-04-06 23:00:36 UTC (rev 430)
+++ trunk/jazz/src/Command.cpp 2008-04-06 23:58:31 UTC (rev 431)
@@ -535,7 +535,7 @@
*/
void tCmdSeqLength::ExecuteEvent(JZTrack *t, JZEvent *e)
{
- //make a copy of the current event
+ // Make a copy of the current event.
JZEvent *k;
k = (tKeyOn *)e->Copy();
@@ -548,7 +548,6 @@
k->SetClock((long int)(((k->GetClock()-startClock)*scale) + startClock ) );
t->Kill(e);
t->Put(k);
-
}
@@ -593,7 +592,7 @@
0x37ff,
0x3fff
};
-
+
long startvelocity=0;
long startkey=0;
while (e)
@@ -651,16 +650,17 @@
{
tKeyOn *k;
- for(int i=1; i< repeat; i++)
+ for (int i = 1; i < repeat; ++i)
{
- if(e->IsKeyOn()){ //only echo note events
+ if (e->IsKeyOn())
+ {
+ //only echo note events
k = (tKeyOn *)e->Copy();
- k->SetClock(k->GetClock()+ clockDelay*i );
- k->Veloc=(unsigned char)(pow(scale,i)*k->Veloc);
- t->Put(k);
- }
+ k->SetClock(k->GetClock()+ clockDelay * i);
+ k->Veloc = (unsigned char)(pow(scale, i) * k->Veloc);
+ t->Put(k);
}
-
+ }
}
Modified: trunk/jazz/src/Configuration.cpp
===================================================================
--- trunk/jazz/src/Configuration.cpp 2008-04-06 23:00:36 UTC (rev 430)
+++ trunk/jazz/src/Configuration.cpp 2008-04-06 23:58:31 UTC (rev 431)
@@ -94,12 +94,12 @@
tConfigEntry::~tConfigEntry()
{
delete [] Name;
- delete [] StrValue;
+ delete [] StrValue;
}
void tConfigEntry::SetStrValue(const char* pStringValue)
{
- delete [] StrValue;
+ delete [] StrValue;
if (pStringValue)
{
StrValue = new char[strlen(pStringValue) + 1];
Modified: trunk/jazz/src/ControlEdit.cpp
===================================================================
--- trunk/jazz/src/ControlEdit.cpp 2008-04-06 23:00:36 UTC (rev 430)
+++ trunk/jazz/src/ControlEdit.cpp 2008-04-06 23:58:31 UTC (rev 431)
@@ -100,10 +100,9 @@
panel->SetAutoLayout( TRUE ); // tell dialog to use sizer
panel->SetSizer( topsizer ); // actually set the sizer
-
- topsizer->Fit( panel ); // set size to minimum size as calculated by the sizer
- topsizer->SetSizeHints( panel ); // set size hints to honour mininum size
+ topsizer->Fit( panel ); // set size to minimum size as calculated by the sizer
+ topsizer->SetSizeHints( panel ); // set size hints to honour mininum size
}
Modified: trunk/jazz/src/DeprecatedWx/proplist.cpp
===================================================================
--- trunk/jazz/src/DeprecatedWx/proplist.cpp 2008-04-06 23:00:36 UTC (rev 430)
+++ trunk/jazz/src/DeprecatedWx/proplist.cpp 2008-04-06 23:58:31 UTC (rev 431)
@@ -1811,7 +1811,7 @@
if (sel == wxNOT_FOUND)
return;
- wxStringList::compatibility_iterator* node =
+ wxStringList::compatibility_iterator* node =
(wxStringList::compatibility_iterator*)
m_listBox->wxListBox::GetClientData(sel);
if (!node)
Modified: trunk/jazz/src/Dialogs.h
===================================================================
--- trunk/jazz/src/Dialogs.h 2008-04-06 23:00:36 UTC (rev 430)
+++ trunk/jazz/src/Dialogs.h 2008-04-06 23:58:31 UTC (rev 431)
@@ -39,11 +39,11 @@
long mSteps; // 0 was static
long mUnit;
-
+
JZEventFrame* mpEventWindow;
JZFilter* mpFilter;
JZSong* mpSong;
-
+
tShiftDlg(JZEventFrame* pEventWindow, JZFilter* pFilter, long Unit);
void AddProperties();
bool OnClose();
Modified: trunk/jazz/src/EventWindow.cpp
===================================================================
--- trunk/jazz/src/EventWindow.cpp 2008-04-06 23:00:36 UTC (rev 430)
+++ trunk/jazz/src/EventWindow.cpp 2008-04-06 23:58:31 UTC (rev 431)
@@ -220,7 +220,7 @@
// //onpaint never seems to get called, but ondraw does get called
// int x = 0, y = 0;
// GetViewStart(&x, &y);
-// EventWin->OnPaintSub(Dc, x * mScrollSize, y * mScrollSize);
+// EventWin->OnPaintSub(Dc, x * mScrollSize, y * mScrollSize);
// cout << "JZEventWindow::OnDraw << endl;
//}
@@ -362,7 +362,7 @@
*/
//void JZEventFrame::CreateCanvas()
//{
-// cout << "CreateCanvas" << endl;
+// cout << "CreateCanvas" << endl;
// int Width, Height;
// GetClientSize(&Width, &Height);
// mpEventWindow = new JZEventWindow(this, 0, 0, Width, Height);
@@ -414,7 +414,7 @@
/**
-this onsize handler is supposed to take care of handling of the resizing the two subwindows sizes to
+this onsize handler is supposed to take care of handling of the resizing the two subwindows sizes to
they dont overlap
*/
void JZEventFrame::OnSize(wxSizeEvent& Event)
@@ -451,7 +451,7 @@
int frameWidth, frameHeight;
GetClientSize(&frameWidth, &frameHeight);
-
+
// if (mpEventWindow)
// // mpEventWindow->SetSize(0, (int)offset, (int)frameWidth, (int)(frameHeight - offset));
// mpEventWindow->SetSize(0, (int)0, (int)frameWidth, (int)(frameHeight));
@@ -607,7 +607,7 @@
dc is the device context to draw in, normally generated from the framework from ondraw
x and y is the coordinates of the start of the view
-
+
*/
void JZEventFrame::OnPaintSub(wxDC *dc, int x, int y)
{
@@ -625,7 +625,7 @@
mEventsWidth = CanvasW - mLeftInfoWidth;
mEventsHeight = CanvasH - mTopInfoHeight;
- FromLine = CanvasY / mTrackHeight;
+ FromLine = CanvasY / mTrackHeight;
ToLine = (CanvasY + CanvasH - mTopInfoHeight) / mTrackHeight;
FromClock = CanvasX * ClocksPerPixel;
ToClock = x2Clock(CanvasX + CanvasW);
Modified: trunk/jazz/src/EventWindow.h
===================================================================
--- trunk/jazz/src/EventWindow.h 2008-04-06 23:00:36 UTC (rev 430)
+++ trunk/jazz/src/EventWindow.h 2008-04-06 23:58:31 UTC (rev 431)
@@ -241,7 +241,7 @@
void ZoomIn();
void ZoomOut();
-
+
protected:
JZToolBar* mpToolBar;
Modified: trunk/jazz/src/Events.h
===================================================================
--- trunk/jazz/src/Events.h 2008-04-06 23:00:36 UTC (rev 430)
+++ trunk/jazz/src/Events.h 2008-04-06 23:58:31 UTC (rev 431)
@@ -734,7 +734,7 @@
void SetTrackState(char c) {
Data[6] = c;
}
-
+
// Data[7] is unused
unsigned char GetTrackDevice() const {
@@ -963,12 +963,12 @@
}
};
-/* the meaning of this event is to be able to reference a track and have that play the instant
-the event is executed. you can also transpose the referenced track and loop it for the duration
-of the playtrack event. this makes it possible to compose in a structured fashion.
-
-ececution of the events takes place in song.cpp.
-*/
+// the meaning of this event is to be able to reference a track and have that
+// play the instant the event is executed. You can also transpose the
+// referenced track and loop it for the duration of the playtrack event. This
+// makes it possible to compose in a structured fashion.
+//
+// Execution of the events takes place in song.cpp.
class tPlayTrack : public tMetaEvent
{
public:
@@ -977,12 +977,12 @@
int eventlength; //the length of the event, confusing with the Length field of tMetaEvent, that seems to be for serialization
virtual int GetLength() { edb(); return eventlength; }
-
+
tPlayTrack(int clk, unsigned char *chardat, unsigned short len)
: tMetaEvent(clk, StatPlayTrack, chardat, len)
{
int *dat = (int *)chardat;
- //fill in the fields from the data
+ //fill in the fields from the data
track=0;
transpose=0;
eventlength=0;
@@ -992,15 +992,15 @@
eventlength=dat[2];
}
}
-
- tPlayTrack(int clk, int track, int transpose, int eventlength)
- : tMetaEvent(clk, StatPlayTrack, 0, 0)
- {
- this->track=track;
- this->transpose=transpose;
- this->eventlength=eventlength;
- }
+ tPlayTrack(int clk, int track, int transpose, int eventlength)
+ : tMetaEvent(clk, StatPlayTrack, 0, 0)
+ {
+ this->track=track;
+ this->transpose=transpose;
+ this->eventlength=eventlength;
+ }
+
virtual int Write(JZWriteBase &io)
{
@@ -1010,7 +1010,7 @@
dat[1]=transpose;
dat[2]=eventlength;
Length=sizeof(int)*3;
- edb();
+ edb();
Data[Length] = 0;
return io.Write(this, Data, Length);
@@ -1022,7 +1022,7 @@
edb();
return new tPlayTrack(mClock, track, transpose, eventlength);
}
-
+
//this event has no real "pitch" but the rest of jazz use the pitch, in the pianowin editor pitch is the y coord of the event
virtual int GetPitch(){
return track;
Modified: trunk/jazz/src/FileSelector.cpp
===================================================================
--- trunk/jazz/src/FileSelector.cpp 2008-04-06 23:00:36 UTC (rev 430)
+++ trunk/jazz/src/FileSelector.cpp 2008-04-06 23:58:31 UTC (rev 431)
@@ -58,10 +58,10 @@
// This is the file name.
//*****************************************************************************
wxString file_selector(
- wxString deffile,
- const wxString title,
- bool save,
- bool changed,
+ wxString deffile,
+ const wxString title,
+ bool save,
+ bool changed,
const wxString ext)
{
wxString s;
@@ -69,10 +69,12 @@
wxString path;
if (save)
+ {
file = wxFileNameFromPath(deffile);
-
+ }
+
path = wxPathOnly(deffile);
-
+
int flags = save ? wxFD_SAVE : wxFD_OPEN;
s = wxFileSelector(title, path, file, 0, ext, flags);
Modified: trunk/jazz/src/FindFile.cpp
===================================================================
--- trunk/jazz/src/FindFile.cpp 2008-04-06 23:00:36 UTC (rev 430)
+++ trunk/jazz/src/FindFile.cpp 2008-04-06 23:58:31 UTC (rev 431)
@@ -34,9 +34,9 @@
//
// 1. using the passed file name
// 2. appending the passed file name to the path specified by the HOME
-// environment variable, if it exists
+// environment variable, if it exists
// 3. appending the passed file name to the path specified by the JAZZ
-// environment variable, if it exists
+// environment variable, if it exists
// 4. appending the passed file name to the location of the jazz executable
//
// Returns:
Modified: trunk/jazz/src/FindFile.h
===================================================================
--- trunk/jazz/src/FindFile.h 2008-04-06 23:00:36 UTC (rev 430)
+++ trunk/jazz/src/FindFile.h 2008-04-06 23:58:31 UTC (rev 431)
@@ -30,9 +30,9 @@
//
// 1. using the passed file name
// 2. appending the passed file name to the path specified by the HOME
-// environment variable, if it exists
+// environment variable, if it exists
// 3. appending the passed file name to the path specified by the JAZZ
-// environment variable, if it exists
+// environment variable, if it exists
// 4. appending the passed file name to the location of the jazz executable
//
// Returns:
Modified: trunk/jazz/src/Harmony.cpp
===================================================================
--- trunk/jazz/src/Harmony.cpp 2008-04-06 23:00:36 UTC (rev 430)
+++ trunk/jazz/src/Harmony.cpp 2008-04-06 23:58:31 UTC (rev 431)
@@ -355,12 +355,12 @@
#ifdef OBSOLETE
wxDialogBox *panel = new wxDialogBox(parent, "MIDI settings", FALSE );
tHBPlayerForm *form = new tHBPlayerForm;
-
+
form->Add(wxMakeFormMessage("Note Length for paste into piano window"));
form->Add(wxMakeFormNewLine());
form->Add(wxMakeFormShort("Length", ¬e_length, wxFORM_DEFAULT, new wxList(wxMakeConstraintRange(10.0, 120.0), 0)));
form->Add(wxMakeFormNewLine());
-
+
panel->SetLabelPosition(wxHORIZONTAL);
form->Add(wxMakeFormBool("Bass enable", &bass_enabled));
@@ -432,8 +432,12 @@
void TransposeSelection();
HBPlayer player;
- enum {SEQMAX = 256};
+ enum
+ {
+ SEQMAX = 256
+ };
+
HBAnalyzer * getAnalyzer();
protected:
@@ -1358,7 +1362,7 @@
wxString* snames = new wxString[n_scale_names];
for (i = 0; i < n_scale_names; i++)
snames[i] = (char *)scale_names[i].name;
- scale_lst = new wxListBox(this, -1, wxPoint(200, y), wxSize(300, 200), n_scale_names, snames, wxLB_SINGLE| wxLB_NEEDED_SB);//"Scales",
+ scale_lst = new wxListBox(this, -1, wxPoint(200, y), wxSize(300, 200), n_scale_names, snames, wxLB_SINGLE| wxLB_NEEDED_SB);//"Scales",
delete [] snames;
// thats it
Modified: trunk/jazz/src/Harmony.h
===================================================================
--- trunk/jazz/src/Harmony.h 2008-04-06 23:00:36 UTC (rev 430)
+++ trunk/jazz/src/Harmony.h 2008-04-06 23:58:31 UTC (rev 431)
@@ -34,7 +34,9 @@
class tHBInterface
{
public:
- virtual ~tHBInterface() {}
+ virtual ~tHBInterface()
+ {
+ }
virtual int SeqDefined() = 0; // true = yes
// return number of keys in out
Modified: trunk/jazz/src/KeyDialog.cpp
===================================================================
--- trunk/jazz/src/KeyDialog.cpp 2008-04-06 23:00:36 UTC (rev 430)
+++ trunk/jazz/src/KeyDialog.cpp 2008-04-06 23:58:31 UTC (rev 431)
@@ -50,7 +50,7 @@
wxProperty* tKeyDlg::mkProperty()
{
- return new wxProperty(mpTitle, wxPropertyValue((char**)&mpString), "string");
+ return new wxProperty(mpTitle, wxPropertyValue((char**)&mpString), "string");
}
int tKeyDlg::GetKey()
Modified: trunk/jazz/src/MouseAction.cpp
===================================================================
--- trunk/jazz/src/MouseAction.cpp 2008-04-06 23:00:36 UTC (rev 430)
+++ trunk/jazz/src/MouseAction.cpp 2008-04-06 23:58:31 UTC (rev 431)
@@ -192,8 +192,8 @@
r2 = r;
r2.SetNormal();
- win->Refresh(TRUE, &r1);
- win->Refresh(TRUE, &r2);
+ win->Refresh(TRUE, &r1);
+ win->Refresh(TRUE, &r2);
}
//invalidate both old and new rect
@@ -241,7 +241,7 @@
Dc.SetLogicalFunction(wxXOR);
Dc.SetBrush(*mpBackgroundBrush);
-
+
rr.SetNormal();
if (rr.width && rr.height)
{
Modified: trunk/jazz/src/PianoFrame.cpp
===================================================================
--- trunk/jazz/src/PianoFrame.cpp 2008-04-06 23:00:36 UTC (rev 430)
+++ trunk/jazz/src/PianoFrame.cpp 2008-04-06 23:58:31 UTC (rev 431)
@@ -163,9 +163,9 @@
EVT_MENU(ID_SNAP_16, JZPianoFrame::OnSnap16)
EVT_MENU(ID_SNAP_16D, JZPianoFrame::OnSnap16D)
- EVT_MENU(ID_SELECT, JZPianoFrame::OnMSelect)
- EVT_MENU(ID_CHANGE_LENGTH, JZPianoFrame::OnMLength)
- EVT_MENU(ID_EVENT_DIALOG, JZPianoFrame::OnMDialog)
+ EVT_MENU(ID_SELECT, JZPianoFrame::OnMSelect)
+ EVT_MENU(ID_CHANGE_LENGTH, JZPianoFrame::OnMLength)
+ EVT_MENU(ID_EVENT_DIALOG, JZPianoFrame::OnMDialog)
EVT_MENU(ID_CUT_PASTE_EVENTS, JZPianoFrame::OnMCutPaste)
EVT_MENU(MEN_GUITAR, JZPianoFrame::OnGuitar)
@@ -266,7 +266,7 @@
delete mpPianoWindow;
delete MixerForm;
-
+
delete mpToolBar;
}
@@ -437,7 +437,7 @@
mpPianoWindow->Redo();
}
-// Undo actions
+// Undo actions
void JZPianoFrame::OnUndo(wxCommandEvent& Event)
{
mpPianoWindow->Undo();
Modified: trunk/jazz/src/PianoWindow.cpp
===================================================================
--- trunk/jazz/src/PianoWindow.cpp 2008-04-06 23:00:36 UTC (rev 430)
+++ trunk/jazz/src/PianoWindow.cpp 2008-04-06 23:58:31 UTC (rev 431)
@@ -368,7 +368,7 @@
int Length = Clock - Copy->GetClock();
if (Length <= 0)
Length = 1;
- Copy->eventlength = Length;
+ Copy->eventlength = Length;
Win->DrawEvent(Dc, Copy, Copy->GetBrush(), 1, 1);
return 0;
@@ -530,7 +530,7 @@
//-----------------------------------------------------------------------------
BEGIN_EVENT_TABLE(JZPianoWindow, JZEventWindow)
- EVT_SIZE(JZPianoWindow::OnSize)
+ EVT_SIZE(JZPianoWindow::OnSize)
EVT_MOUSE_EVENTS(JZPianoWindow::OnMouseEvent)
@@ -628,7 +628,7 @@
int c;
for (int i = 0; i < NUM_COLORS; ++i)
{
- c = 256 * i / NUM_COLORS;
+ c = 256 * i / NUM_COLORS;
mpColorBrush[i].SetColour(c, 0, 127 - c / 2);
mpColorBrush[i].SetStyle(wxSOLID);
}
@@ -679,7 +679,7 @@
// OnPaint never seems to get called, but OnDraw does get called.
int x = 0, y = 0;
GetViewStart(&x, &y);
- OnPaintSub(Dc, x * mScrollSize, y * mScrollSize);
+ OnPaintSub(Dc, x * mScrollSize, y * mScrollSize);
}
//-----------------------------------------------------------------------------
@@ -914,7 +914,7 @@
DrawEvents(Dc, mpTrack, StatSysEx, wxGREEN_BRUSH, FALSE);
if (mVisiblePlayTrack)
DrawEvents(Dc, mpTrack, StatPlayTrack, wxLIGHT_GREY_BRUSH, FALSE);
-
+
DrawEvents(Dc, mpTrack, StatEndOfTrack, wxRED_BRUSH, FALSE);
DrawEvents(Dc, mpTrack, StatText, wxBLACK_BRUSH, FALSE);
@@ -962,7 +962,7 @@
mEventsWidth = mCanvasWidth - mLeftInfoWidth;
mEventsHeight = mCanvasHeight - mTopInfoHeight;
- mFromLine = mCanvasY / mTrackHeight;
+ mFromLine = mCanvasY / mTrackHeight;
mToLine = (mCanvasY + mCanvasHeight - mTopInfoHeight) / mTrackHeight;
mFromClock = mCanvasX * mClockTicsPerPixel;
mToClock = x2Clock(mCanvasX + mCanvasWidth);
@@ -1275,7 +1275,7 @@
}
int x = Clock2x(pEvent->GetClock());
int y = Pitch2y(pEvent->GetPitch());
- if (!xoor)
+ if (!xoor)
{
Dc.SetBrush(*wxWHITE_BRUSH);
Dc.DrawRectangle(x, y + mLittleBit, length, mTrackHeight - 2 * mLittleBit);
@@ -1369,17 +1369,17 @@
// end velocity colors
Dc.DrawRectangle(x1, y1 + mLittleBit, DrawLength, mTrackHeight - 2 * mLittleBit);
- //shouldnt it be in drawevent? odd.
+ //shouldnt it be in drawevent? odd.
if (pEvent->IsPlayTrack())
{
Dc.SetPen(*wxBLACK_PEN);
ostringstream Oss;
- Oss << "Track:" << pEvent->IsPlayTrack()->track;
+ Oss << "Track:" << pEvent->IsPlayTrack()->track;
Dc.DrawText(Oss.str().c_str(), x1, y1 + mLittleBit);
}
}
-
+
if (Clock + Length >= mFromClock)
{
//thesse events are always visible in vertical
@@ -1388,10 +1388,10 @@
Dc.SetPen(*wxRED_PEN);
Dc.VLine(x1); //draw a vertical bar
Dc.SetPen(*wxBLACK_PEN);
- sprintf(buf, "EOT");
+ sprintf(buf, "EOT");
Dc.DrawText(buf, x1, y1 + mLittleBit);
}
-
+
if (pEvent->IsText())
{
Dc.SetPen(*wxGREEN_PEN);
@@ -1400,8 +1400,8 @@
sprintf(buf, (const char*)pEvent->IsText()->GetText());
int textX;
int textY;
-
- Dc.GetTextExtent((const char*)pEvent->IsText()->GetText(), &textX, &textY);
+
+ Dc.GetTextExtent((const char*)pEvent->IsText()->GetText(), &textX, &textY);
Dc.SetBrush(*wxWHITE_BRUSH);
int textlabely = mCanvasY + mTopInfoHeight;//text labels drawn at top
Dc.DrawRectangle(x1-textX, textlabely + mLittleBit, textX, textY);//mTrackHeight - 2 * mLittleBit);
@@ -1814,7 +1814,7 @@
Dc.SetLogicalFunction(wxXOR);
Dc.SetBrush(*wxBLUE_BRUSH);
- if (mMouseLine >= 0)
+ if (mMouseLine >= 0)
{
// Erase the previous highlight.
Dc.DrawRectangle(
@@ -2299,7 +2299,7 @@
CtrlH(Height));
mpCtrlEdit->ReInit(mpTrack, mFromClock, mClockTicsPerPixel);
- Refresh();
+ Refresh();
}
void JZPianoWindow::CtrlPolyAftertouchEdit()
@@ -2319,14 +2319,14 @@
CtrlH(Height));
mpCtrlEdit->ReInit(mpTrack, mFromClock, mClockTicsPerPixel);
- Refresh();
+ Refresh();
}
void JZPianoWindow::CtrlNone()
{
delete mpCtrlEdit;
mpCtrlEdit = 0;
- Refresh();
+ Refresh();
}
void JZPianoWindow::CtrlTempo()
@@ -2388,7 +2388,7 @@
CtrlH(Height));
mpCtrlEdit->ReInit(mpTrack, mFromClock, mClockTicsPerPixel);
- Refresh();
+ Refresh();
}
void JZPianoWindow::EditFilter()
@@ -2418,7 +2418,7 @@
mpCtrlEdit->ReInit(mpTrack, mFromClock, mClockTicsPerPixel);
Refresh();
- }
+ }
}
void JZPianoWindow::CtrlModulation()
@@ -2439,7 +2439,7 @@
CtrlH(Height));
mpCtrlEdit->ReInit(mpTrack, mFromClock, mClockTicsPerPixel);
- Refresh();
+ Refresh();
}
void JZPianoWindow::CtrlPitch()
@@ -2457,9 +2457,9 @@
CtrlY(Height),
mCanvasWidth,
CtrlH(Height));
-
+
mpCtrlEdit->ReInit(mpTrack, mFromClock, mClockTicsPerPixel);
- Refresh();
+ Refresh();
}
void JZPianoWindow::Redo()
@@ -2468,18 +2468,18 @@
Refresh();
if (mpCtrlEdit && mpTrack >= 0)
{
- mpCtrlEdit->ReInit(mpTrack, mFromClock, mClockTicsPerPixel);
+ mpCtrlEdit->ReInit(mpTrack, mFromClock, mClockTicsPerPixel);
}
}
-// Undo actions
+// Undo actions
void JZPianoWindow::Undo()
{
mpSong->Undo();
Refresh();
if (mpCtrlEdit && mpTrack >= 0)
{
- mpCtrlEdit->ReInit(mpTrack, mFromClock, mClockTicsPerPixel);
+ mpCtrlEdit->ReInit(mpTrack, mFromClock, mClockTicsPerPixel);
}
}
@@ -2502,7 +2502,7 @@
tCmdExchUpDown cmd(mpFilter);
cmd.Execute(1);
Refresh();
- }
+ }
}
// Flip events left to right.
@@ -2513,7 +2513,7 @@
tCmdExchLeftRight cmd(mpFilter);
cmd.Execute(1);
Refresh();
- }
+ }
}
// Shift events snapclock clocks to left.
@@ -2561,7 +2561,7 @@
mpGuitarFrame->Update();
// mpGuitarFrame->Redraw();
}
- }
+ }
}
void JZPianoWindow::Erase()
@@ -2571,14 +2571,14 @@
tCmdErase cmd(mpFilter);
cmd.Execute(1); // with UNDO
Refresh();
- }
+ }
}
void JZPianoWindow::ToggleVisibleAllTracks()
{
mVisibleAllTracks = !mVisibleAllTracks;
- Refresh();
+ Refresh();
}
void JZPianoWindow::MSelect()
@@ -2798,7 +2798,7 @@
void JZPianoWindow::ActivateSettingsDialog()
{
jppResourceDialog Dialog(this, "windowSettings");
-
+
Dialog.Attach("use_colours", &mUseColors);
Dialog.Attach("font_size", &mFontSize, mPianoFontSizes);
@@ -2824,7 +2824,7 @@
int repeat = 6;
jppResourceDialog dialog(this, "midiDelay");
-
+
dialog.Attach("scale", &scale);
dialog.Attach("clockDelay", &clockDelay);
dialog.Attach("repeat", &repeat);
@@ -2849,9 +2849,9 @@
int scale = 100; //in percent
jppResourceDialog dialog(this, "sequenceLength");
-
+
dialog.Attach("scale", &scale);
-
+
if (dialog.ShowModal() == wxID_OK)
{
//execute the command
Modified: trunk/jazz/src/Player.cpp
===================================================================
--- trunk/jazz/src/Player.cpp 2008-04-06 23:00:36 UTC (rev 430)
+++ trunk/jazz/src/Player.cpp 2008-04-06 23:58:31 UTC (rev 431)
@@ -95,7 +95,7 @@
// for (int i = 0; i < count; i++)
// delete [] names[i];
}
-
+
//tNamedValue *tDeviceList::AsNamedValue()
//{
// tNamedValue *nv = new tNamedValue[count + 1];
Modified: trunk/jazz/src/Player.h
===================================================================
--- trunk/jazz/src/Player.h 2008-04-06 23:00:36 UTC (rev 430)
+++ trunk/jazz/src/Player.h 2008-04-06 23:58:31 UTC (rev 431)
@@ -299,7 +299,7 @@
protected:
virtual void OutNow(JZEvent* pEvent) = 0;
-
+
private:
tDeviceList DummyDeviceList;
Modified: trunk/jazz/src/Project.cpp
===================================================================
--- trunk/jazz/src/Project.cpp 2008-04-06 23:00:36 UTC (rev 430)
+++ trunk/jazz/src/Project.cpp 2008-04-06 23:58:31 UTC (rev 431)
@@ -332,7 +332,7 @@
//-----------------------------------------------------------------------------
JZProject::~JZProject()
{
- delete mpMidiPlayer;
+ delete mpMidiPlayer;
delete mpSynth;
delete mpRecInfo;
delete mpConfig;
Modified: trunk/jazz/src/PropertyListDialog.h
===================================================================
--- trunk/jazz/src/PropertyListDialog.h 2008-04-06 23:00:36 UTC (rev 430)
+++ trunk/jazz/src/PropertyListDialog.h 2008-04-06 23:58:31 UTC (rev 431)
@@ -109,7 +109,7 @@
int MapName2Value(const char* pSelection);
wxString MapValue2Name(int Value);
-
+
virtual bool OnSelect(
bool Select,
wxProperty* pProperty,
Modified: trunk/jazz/src/ResourceDialog.cpp
===================================================================
--- trunk/jazz/src/ResourceDialog.cpp 2008-04-06 23:00:36 UTC (rev 430)
+++ trunk/jazz/src/ResourceDialog.cpp 2008-04-06 23:58:31 UTC (rev 431)
@@ -58,7 +58,7 @@
wxXmlResource::Get()->InitAllHandlers();
initialized = true;
}
-
+
wxXmlResource::Get()->Load(xrcfile);
}
@@ -196,7 +196,7 @@
++iResourceElement)
{
jppResourceElement* pResourceElement = *iResourceElement;
-
+
wxWindow* win = wxWindow::FindWindowByName(
pResourceElement->resource, dialog);
@@ -290,7 +290,7 @@
{
if (value == pResourceElement->longarr[i]) break;
}
-
+
if (i == pResourceElement->longarr.GetCount())
{
// We couldn't find the value in the list.
@@ -313,7 +313,7 @@
((wxSlider*)win)->SetValue((int)value);
}
}
-
+
if (!used)
{
wxMessageBox("Unable to locate a mapping for this widget:\n"
Modified: trunk/jazz/src/Sample.cpp
===================================================================
--- trunk/jazz/src/Sample.cpp 2008-04-06 23:00:36 UTC (rev 430)
+++ trunk/jazz/src/Sample.cpp 2008-04-06 23:58:31 UTC (rev 431)
@@ -593,9 +593,9 @@
{
/* PAT - The following error prompted the addition of the casts to double.
sample.cpp: In member function `void tSample::TransposeSemis(float)':
- choosing `double pow(double, double)' over `float
+ choosing `double pow(double, double)' over `float
std::pow(float, float)'
- because worst conversion for the former is better than worst
+ because worst conversion for the former is better than worst
conversion for the latter
*/
float f = (double)pow((double)FSEMI, (double)semis);
Modified: trunk/jazz/src/SampleDialog.cpp
===================================================================
--- trunk/jazz/src/SampleDialog.cpp 2008-04-06 23:00:36 UTC (rev 430)
+++ trunk/jazz/src/SampleDialog.cpp 2008-04-06 23:58:31 UTC (rev 431)
@@ -649,13 +649,13 @@
//cancel = new wxButton(panel, (wxFunction)ItemCallback, "Close");
//panel->NewLine();
chk_fft = new wxCheckBox(panel, -1, "Harmonics"); // (wxFunction)ItemCallback,
- chk_fft->SetValue(fft_enable);
+ chk_fft->SetValue(fft_enable);
chk_vol = new wxCheckBox(panel, -1, "Envelope"); // (wxFunction)ItemCallback,
- chk_vol->SetValue(vol_enable);
+ chk_vol->SetValue(vol_enable);
chk_pan = new wxCheckBox(panel, -1, "Panpot"); // (wxFunction)ItemCallback,
- chk_pan->SetValue(pan_enable);
+ chk_pan->SetValue(pan_enable);
chk_frq = new wxCheckBox(panel, -1, "Pitch"); // (wxFunction)ItemCallback,
- chk_frq->SetValue(frq_enable);
+ chk_frq->SetValue(frq_enable);
chk_noise = new wxCheckBox(panel, -1, "Noise"); // (wxFunction)ItemCallback,
chk_noise->SetValue(noise_enable);
#ifdef OBSOLETE
Modified: trunk/jazz/src/SliderWindow.cpp
===================================================================
--- trunk/jazz/src/SliderWindow.cpp 2008-04-06 23:00:36 UTC (rev 430)
+++ trunk/jazz/src/SliderWindow.cpp 2008-04-06 23:58:31 UTC (rev 431)
@@ -83,7 +83,7 @@
BEGIN_EVENT_TABLE(tSliderWin, wxFrame)
- EVT_SIZE(tSliderWin::OnSize)
+ EVT_SIZE(tSliderWin::OnSize)
END_EVENT_TABLE()
/**called from the event table whenever the window is resized
Modified: trunk/jazz/src/Song.cpp
===================================================================
--- trunk/jazz/src/Song.cpp 2008-04-06 23:00:36 UTC (rev 430)
+++ trunk/jazz/src/Song.cpp 2008-04-06 23:58:31 UTC (rev 431)
@@ -248,15 +248,15 @@
return;
fprintf(stderr, "playtrack %d\n",c->track);
JZTrack* pTrack = &mTracks[c->track];//the track we want to play
- tEventIterator IteratorPL(pTrack); //get an iterator of all events the playtrack is pointing to
+ tEventIterator IteratorPL(pTrack); //get an iterator of all events the playtrack is pointing to
JZEvent *f;
//FIXME this is just to test the idea, it would be good to modify getlastclock instead i think
//find an EOT event, otherwise default to the last clock(should be + length of the last event as well)
int loopLength = 0;
- tEventIterator IteratorEOT(pTrack); //get an iterator of all events the playtrack is pointing to
+ tEventIterator IteratorEOT(pTrack); //get an iterator of all events the playtrack is pointing to
f = IteratorEOT.Range(0, pTrack->GetLastClock());
- loopLength = pTrack->GetLastClock();
+ loopLength = pTrack->GetLastClock();
while(f)
{
if (f->IsEndOfTrack())
@@ -280,8 +280,8 @@
// start of those to the beginning of the loop, and shorten the length.
// There would still be a problem with playtracks not even bar length.
while(loopOffset < c->eventlength)
- {
- f = IteratorPL.Range(0, (c->eventlength-loopOffset)); //no more events then the length of the playtrack! and ensure last iteration is no longer than what is left
+ {
+ f = IteratorPL.Range(0, (c->eventlength-loopOffset)); //no more events then the length of the playtrack! and ensure last iteration is no longer than what is left
while (f)
{
JZEvent *d = f->Copy();
Modified: trunk/jazz/src/Track.cpp
===================================================================
--- trunk/jazz/src/Track.cpp 2008-04-06 23:00:36 UTC (rev 430)
+++ trunk/jazz/src/Track.cpp 2008-04-06 23:58:31 UTC (rev 431)
@@ -497,7 +497,7 @@
++j;
--newnEvents;
}
-
+
JZEvent* item;
if (j <= MaxEvents)
{
@@ -524,7 +524,7 @@
Resize();
}
Events[nEvents++] = e;
-
+
#ifdef E_DBUG
{
for (int i = 0; i < nEvents; i++)
Modified: trunk/jazz/src/TrackWindow.cpp
===================================================================
--- trunk/jazz/src/TrackWindow.cpp 2008-04-06 23:00:36 UTC (rev 430)
+++ trunk/jazz/src/TrackWindow.cpp 2008-04-06 23:58:31 UTC (rev 431)
@@ -635,7 +635,7 @@
// Draw the selection box.
mpSnapSel->Draw(LocalDc, mEventsX, mEventsY, mEventsWidth, mEventsHeight);
-
+
// LocalDc.SetClippingRegion(0, 0, mCanvasWidth, mCanvasHeight);
Dc.Blit(
mScrolledX,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
