Menu
▾
▴
SF.net SVN: jazzplusplus: [432] trunk/jazz/src
|
From: <pst...@us...> - 2008-04-07 00:07:01
|
Revision: 432
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=432&view=rev
Author: pstieber
Date: 2008-04-06 17:06:59 -0700 (Sun, 06 Apr 2008)
Log Message:
-----------
Replaced tab characters with spaces.
Modified Paths:
--------------
trunk/jazz/src/AlsaThru.cpp
trunk/jazz/src/AudioDriver.cpp
trunk/jazz/src/Dialogs/copyDialog.cpp
trunk/jazz/src/Dialogs/copyDialog.h
trunk/jazz/src/Dialogs/midiThruDialog.cpp
trunk/jazz/src/Dialogs/midiTiming.cpp
trunk/jazz/src/Dialogs/midiTiming.h
trunk/jazz/src/SignalInterface.h
trunk/jazz/src/commands/copyCommand.cpp
trunk/jazz/src/mswin/jazz.rc
Modified: trunk/jazz/src/AlsaThru.cpp
===================================================================
--- trunk/jazz/src/AlsaThru.cpp 2008-04-06 23:58:31 UTC (rev 431)
+++ trunk/jazz/src/AlsaThru.cpp 2008-04-07 00:06:59 UTC (rev 432)
@@ -21,7 +21,7 @@
//
// Changes
//
-// 2000.03.18 Takashi Iwai <iw...@ww...>
+// 2000.03.18 Takashi Iwai <iw...@ww...>
// - Modified for ALSA 0.5.x
// - Thru-connection is done inside ALSA sequencer core if
// USE_DIRECT_CONNECTION is defined in alsathru.h.
Modified: trunk/jazz/src/AudioDriver.cpp
===================================================================
--- trunk/jazz/src/AudioDriver.cpp 2008-04-06 23:58:31 UTC (rev 431)
+++ trunk/jazz/src/AudioDriver.cpp 2008-04-07 00:06:59 UTC (rev 432)
@@ -101,7 +101,7 @@
count_info cinfo;
if (ioctl(mpPlayer->dev, SNDCTL_DSP_GETOPTR, &cinfo) == -1)
{
- perror("SNDCTL_DSP_GETOPTR");
+ perror("SNDCTL_DSP_GETOPTR");
}
return (cinfo.bytes - cinfo.ptr) / sizeof(short);
}
@@ -143,7 +143,7 @@
if (caps & DSP_CAP_DUPLEX)
{
- mCanDuplex = 1; // good soundcard!
+ mCanDuplex = 1; // good soundcard!
}
if (!(caps & DSP_CAP_TRIGGER))
@@ -325,7 +325,7 @@
{
if (ioctl(dev, SNDCTL_DSP_RESET, 0) == -1)
{
- perror("SNDCTL_DSP_RESET");
+ perror("SNDCTL_DSP_RESET");
}
}
else
@@ -432,7 +432,7 @@
// oss bug? It send EINTR?? on first read..
if (errno != EINTR && errno != EAGAIN)
{
- perror("read");
+ perror("read");
}
recbuffers.UndoRequest();
break;
@@ -501,11 +501,11 @@
if (ioctl(seqfd, SNDCTL_TMR_TEMPO, &new_speed) < 0)
{
// Sometimes this happens with mpu-401 timer.
- ; // perror("SNDCTL_TMR_TEMPO");
+ ; // perror("SNDCTL_TMR_TEMPO");
}
else
{
- curr_speed = new_speed;
+ curr_speed = new_speed;
}
}
}
Modified: trunk/jazz/src/Dialogs/copyDialog.cpp
===================================================================
--- trunk/jazz/src/Dialogs/copyDialog.cpp 2008-04-06 23:58:31 UTC (rev 431)
+++ trunk/jazz/src/Dialogs/copyDialog.cpp 2008-04-07 00:06:59 UTC (rev 432)
@@ -26,7 +26,7 @@
void tCopyDlg::OnHelp()
{
- HelpInstance->ShowTopic("Replicate");
+ HelpInstance->ShowTopic("Replicate");
}
Modified: trunk/jazz/src/Dialogs/copyDialog.h
===================================================================
--- trunk/jazz/src/Dialogs/copyDialog.h 2008-04-06 23:58:31 UTC (rev 431)
+++ trunk/jazz/src/Dialogs/copyDialog.h 2008-04-07 00:06:59 UTC (rev 432)
@@ -31,16 +31,30 @@
{
tCopyCommand *cp;
- public:
- tCopyDlg(tCopyCommand *c)
- : wxForm( USED_WXFORM_BUTTONS ) { cp = c; }
- void OnOk() { cp->OnOk(); wxForm::OnOk(); }
- void OnCancel() { cp->OnCancel(); wxForm::OnCancel(); }
- void OnHelp();
- void EditForm(wxPanel *panel);
+ public:
+ tCopyDlg(tCopyCommand *c)
+ : wxForm( USED_WXFORM_BUTTONS )
+ {
+ cp = c;
+ }
+
+ void OnOk()
+ {
+ cp->OnOk();
+ wxForm::OnOk();
+ }
+
+ void OnCancel()
+ {
+ cp->OnCancel();
+ wxForm::OnCancel();
+ }
+
+ void OnHelp();
+
+ void EditForm(wxPanel *panel);
};
#endif // Porting
#endif // COPYDIALOG
-
Modified: trunk/jazz/src/Dialogs/midiThruDialog.cpp
===================================================================
--- trunk/jazz/src/Dialogs/midiThruDialog.cpp 2008-04-06 23:58:31 UTC (rev 431)
+++ trunk/jazz/src/Dialogs/midiThruDialog.cpp 2008-04-07 00:06:59 UTC (rev 432)
@@ -37,7 +37,7 @@
void tMidiThruDlg::OnHelp()
{
- HelpInstance->ShowTopic("Midi Thru");
+ HelpInstance->ShowTopic("Midi Thru");
}
Modified: trunk/jazz/src/Dialogs/midiTiming.cpp
===================================================================
--- trunk/jazz/src/Dialogs/midiTiming.cpp 2008-04-06 23:58:31 UTC (rev 431)
+++ trunk/jazz/src/Dialogs/midiTiming.cpp 2008-04-07 00:06:59 UTC (rev 432)
@@ -116,10 +116,12 @@
{
int i;
char *str = copystring( ClkSrcListBox->GetStringSelection() );
- for (i = 0; i < 4; i++) {
- if (!strcmp(str,ClkSrcArray[i])) {
- break;
- }
+ for (i = 0; i < 4; i++)
+ {
+ if (!strcmp(str,ClkSrcArray[i]))
+ {
+ break;
+ }
}
delete str;
if (i > 3)
@@ -144,7 +146,7 @@
case CsFsk:
case CsInt:
default:
- Midi = new tWinAudioPlayer(EventWin->Song);
+ Midi = new tWinAudioPlayer(EventWin->Song);
break;
}
if (!Midi->Installed())
@@ -157,11 +159,13 @@
tMtcType MtcType;
str = copystring( MtcTypeListBox->GetStringSelection() );
- for (i = 0; i < 4; i++) {
- if (!strcmp(str,MtcTypeArray[i])) {
- MtcType = (tMtcType) i;
- break;
- }
+ for (i = 0; i < 4; i++)
+ {
+ if (!strcmp(str,MtcTypeArray[i]))
+ {
+ MtcType = (tMtcType) i;
+ break;
+ }
}
delete str;
if (i > 3)
@@ -177,7 +181,7 @@
void tTimingDlg::OnHelp()
{
- HelpInstance->ShowTopic("Timing");
+ HelpInstance->ShowTopic("Timing");
}
@@ -191,11 +195,15 @@
panel->NewLine();
panel->SetLabelPosition(wxVERTICAL);
- ClkSrcListBox = new wxListBox( panel,
- NULL,
- "Clock Source",
- wxSINGLE|wxALWAYS_SB,
- -1, -1, -1, -1 );
+ ClkSrcListBox = new wxListBox(
+ panel,
+ NULL,
+ "Clock Source",
+ wxSINGLE | wxALWAYS_SB,
+ -1,
+ -1,
+ -1,
+ -1);
#ifdef wx_msw
ClkSrcListBox->Append( ClkSrcArray[CsInt] );
@@ -221,13 +229,14 @@
char str[80];
tMtcTime *offs = t->GetMtcOffset();
offs->ToString( str );
- MtcOffsetEntry = new wxText( panel,
- NULL,
- "MTC offset",
- str,
- -1,
- -1,
- 100 );
+ MtcOffsetEntry = new wxText(
+ panel,
+ NULL,
+ "MTC offset",
+ str,
+ -1,
+ -1,
+ 100);
panel->NewLine();
@@ -237,11 +246,16 @@
panel->NewLine();
#endif
- MtcTypeListBox = new wxListBox( panel,
- NULL,
- "MTC Type",
- wxSINGLE|wxALWAYS_SB,
- -1, -1, -1, -1 );
+ MtcTypeListBox = new wxListBox(
+ panel,
+ NULL,
+ "MTC Type",
+ wxSINGLE|wxALWAYS_SB,
+ -1,
+ -1,
+ -1,
+ -1);
+
MtcTypeListBox->Append( MtcTypeArray[0] );
MtcTypeListBox->Append( MtcTypeArray[1] );
MtcTypeListBox->Append( MtcTypeArray[2] );
@@ -250,14 +264,13 @@
delete offs;
panel->NewLine();
- RealTimeCheckBox = new wxCheckBox( panel,
- NULL,
- "Realtime to MIDI Out" );
+ RealTimeCheckBox = new wxCheckBox(
+ panel,
+ NULL,
+ "Realtime to MIDI Out");
+
RealTimeCheckBox->SetValue( Config(C_RealTimeOut) );
panel->NewLine();
}
-
-
#endif // Porting
-
Modified: trunk/jazz/src/Dialogs/midiTiming.h
===================================================================
--- trunk/jazz/src/Dialogs/midiTiming.h 2008-04-06 23:58:31 UTC (rev 431)
+++ trunk/jazz/src/Dialogs/midiTiming.h 2008-04-07 00:06:59 UTC (rev 432)
@@ -57,11 +57,20 @@
static void HelpFunc( tMidiButton& button, wxCommandEvent& event );
};
-class tMidiButton : public wxButton {
+class tMidiButton : public wxButton
+{
public:
- tMidiButton( tTimingDlg *dlg,
- wxPanel *panel, wxFunction func, char *label, int x = -1, int y = -1,
- int width = -1, int height = -1, long style = 0, char *name = "button")
+ tMidiButton(
+ tTimingDlg *dlg,
+ wxPanel *panel,
+ wxFunction func,
+ char *label,
+ int x = -1,
+ int y = -1,
+ int width = -1,
+ int height = -1,
+ long style = 0,
+ char *name = "button")
: wxButton( panel, func, label, x, y, width, height, style, name )
{
midiDlg = dlg;
Modified: trunk/jazz/src/SignalInterface.h
===================================================================
--- trunk/jazz/src/SignalInterface.h 2008-04-06 23:58:31 UTC (rev 431)
+++ trunk/jazz/src/SignalInterface.h 2008-04-07 00:06:59 UTC (rev 432)
@@ -36,7 +36,7 @@
float pitch_range, // 1 = one octave
float pan_freq, // in Hz
float pan_spread, // 0..1
- float volume // -1..1
+ float volume // -1..1
);
void sig_reverb(
@@ -47,12 +47,12 @@
float room_val); // echo delay
void sig_wavsynth(
- tSample& spl, // destin
- double durat, // length in seconds
- int midi_key, // base freq
- double fshift, // frequeny modulation factor
- int N, // number of wavetables to be mixed
- JZRndArray* arr[][4], // (fft, vol, pitch, pan) * N
+ tSample& spl, // destin
+ double durat, // length in seconds
+ int midi_key, // base freq
+ double fshift, // frequeny modulation factor
+ int N, // number of wavetables to be mixed
+ JZRndArray* arr[][4], // (fft, vol, pitch, pan) * N
int noisegen // first array is noise filter
);
Modified: trunk/jazz/src/commands/copyCommand.cpp
===================================================================
--- trunk/jazz/src/commands/copyCommand.cpp 2008-04-06 23:58:31 UTC (rev 431)
+++ trunk/jazz/src/commands/copyCommand.cpp 2008-04-07 00:06:59 UTC (rev 432)
@@ -48,9 +48,13 @@
if (Mouse->Aborted)
{
if (CopyDlg)
- CopyDlg->OnCancel();
+ {
+ CopyDlg->OnCancel();
+ }
else
- Execute(0);
+ {
+ Execute(0);
+ }
}
else if (!MarkRepeat)
{
Modified: trunk/jazz/src/mswin/jazz.rc
===================================================================
--- trunk/jazz/src/mswin/jazz.rc 2008-04-06 23:58:31 UTC (rev 431)
+++ trunk/jazz/src/mswin/jazz.rc 2008-04-07 00:06:59 UTC (rev 432)
@@ -18,45 +18,45 @@
tb_note83 BITMAP "..\\bitmaps\\note83.bmp"
tb_note16 BITMAP "..\\bitmaps\\note16.bmp"
tb_note163 BITMAP "..\\bitmaps\\note163.bmp"
-tb_majscale BITMAP "..\\bitmaps\\majscale.bmp"
-tb_harscale BITMAP "..\\bitmaps\\harscale.bmp"
-tb_melscale BITMAP "..\\bitmaps\\melscale.bmp"
-tb_ionscale BITMAP "..\\bitmaps\\ionscale.bmp"
-tb_same4 BITMAP "..\\bitmaps\\same4.bmp"
-tb_same3 BITMAP "..\\bitmaps\\same3.bmp"
-tb_same2 BITMAP "..\\bitmaps\\same2.bmp"
-tb_same1 BITMAP "..\\bitmaps\\same1.bmp"
-tb_sameh BITMAP "..\\bitmaps\\sameh.bmp"
-tb_sameb BITMAP "..\\bitmaps\\sameb.bmp"
-tb_same0 BITMAP "..\\bitmaps\\same0.bmp"
-tb_std251 BITMAP "..\\bitmaps\\std251.bmp"
-tb_tritone BITMAP "..\\bitmaps\\tritone.bmp"
-tb_haunsch BITMAP "..\\bitmaps\\haunsch.bmp"
-tb_piano BITMAP "..\\bitmaps\\piano.bmp"
-tb_transpos BITMAP "..\\bitmaps\\transpos.bmp"
-tb_analyze BITMAP "..\\bitmaps\\analyze.bmp"
-tb_delchord BITMAP "..\\bitmaps\\delchord.bmp"
-tb_shiftl BITMAP "..\\bitmaps\\shiftl.bmp"
-tb_shiftr BITMAP "..\\bitmaps\\shiftr.bmp"
-tb_rrgadd BITMAP "..\\bitmaps\\rrgadd.bmp"
-tb_rrgdel BITMAP "..\\bitmaps\\rrgdel.bmp"
-tb_rrgup BITMAP "..\\bitmaps\\rrgup.bmp"
-tb_rrgdown BITMAP "..\\bitmaps\\rrgdown.bmp"
-tb_rrggen BITMAP "..\\bitmaps\\rrggen.bmp"
-tb_pianowin BITMAP "..\\bitmaps\\pianowin.bmp"
+tb_majscale BITMAP "..\\bitmaps\\majscale.bmp"
+tb_harscale BITMAP "..\\bitmaps\\harscale.bmp"
+tb_melscale BITMAP "..\\bitmaps\\melscale.bmp"
+tb_ionscale BITMAP "..\\bitmaps\\ionscale.bmp"
+tb_same4 BITMAP "..\\bitmaps\\same4.bmp"
+tb_same3 BITMAP "..\\bitmaps\\same3.bmp"
+tb_same2 BITMAP "..\\bitmaps\\same2.bmp"
+tb_same1 BITMAP "..\\bitmaps\\same1.bmp"
+tb_sameh BITMAP "..\\bitmaps\\sameh.bmp"
+tb_sameb BITMAP "..\\bitmaps\\sameb.bmp"
+tb_same0 BITMAP "..\\bitmaps\\same0.bmp"
+tb_std251 BITMAP "..\\bitmaps\\std251.bmp"
+tb_tritone BITMAP "..\\bitmaps\\tritone.bmp"
+tb_haunsch BITMAP "..\\bitmaps\\haunsch.bmp"
+tb_piano BITMAP "..\\bitmaps\\piano.bmp"
+tb_transpos BITMAP "..\\bitmaps\\transpos.bmp"
+tb_analyze BITMAP "..\\bitmaps\\analyze.bmp"
+tb_delchord BITMAP "..\\bitmaps\\delchord.bmp"
+tb_shiftl BITMAP "..\\bitmaps\\shiftl.bmp"
+tb_shiftr BITMAP "..\\bitmaps\\shiftr.bmp"
+tb_rrgadd BITMAP "..\\bitmaps\\rrgadd.bmp"
+tb_rrgdel BITMAP "..\\bitmaps\\rrgdel.bmp"
+tb_rrgup BITMAP "..\\bitmaps\\rrgup.bmp"
+tb_rrgdown BITMAP "..\\bitmaps\\rrgdown.bmp"
+tb_rrggen BITMAP "..\\bitmaps\\rrggen.bmp"
+tb_pianowin BITMAP "..\\bitmaps\\pianowin.bmp"
-tb_select BITMAP "..\\bitmaps\\select.bmp"
-tb_length BITMAP "..\\bitmaps\\length.bmp"
-tb_dialog BITMAP "..\\bitmaps\\dialog.bmp"
+tb_select BITMAP "..\\bitmaps\\select.bmp"
+tb_length BITMAP "..\\bitmaps\\length.bmp"
+tb_dialog BITMAP "..\\bitmaps\\dialog.bmp"
-tb_play BITMAP "..\\bitmaps\\play.bmp"
-tb_playloop BITMAP "..\\bitmaps\\playloop.bmp"
-tb_record BITMAP "..\\bitmaps\\record.bmp"
-tb_metro BITMAP "..\\bitmaps\\metro.bmp"
+tb_play BITMAP "..\\bitmaps\\play.bmp"
+tb_playloop BITMAP "..\\bitmaps\\playloop.bmp"
+tb_record BITMAP "..\\bitmaps\\record.bmp"
+tb_metro BITMAP "..\\bitmaps\\metro.bmp"
-tb_accept BITMAP "..\\bitmaps\\accept.bmp"
-tb_cancel BITMAP "..\\bitmaps\\cancel.bmp"
-tb_zoomin BITMAP "..\\bitmaps\\zoomin.bmp"
-tb_zoomout BITMAP "..\\bitmaps\\zoomout.bmp"
-tb_cutpaste BITMAP "..\\bitmaps\\cutpaste.bmp"
+tb_accept BITMAP "..\\bitmaps\\accept.bmp"
+tb_cancel BITMAP "..\\bitmaps\\cancel.bmp"
+tb_zoomin BITMAP "..\\bitmaps\\zoomin.bmp"
+tb_zoomout BITMAP "..\\bitmaps\\zoomout.bmp"
+tb_cutpaste BITMAP "..\\bitmaps\\cutpaste.bmp"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
