Menu
▾
▴
SF.net SVN: jazzplusplus: [558] trunk/jazz/src
|
From: <pst...@us...> - 2008-05-22 18:16:42
|
Revision: 558
http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=558&view=rev
Author: pstieber
Date: 2008-05-22 11:16:07 -0700 (Thu, 22 May 2008)
Log Message:
-----------
Encapsulated the mControl and mValue data members of the tControl class.
Modified Paths:
--------------
trunk/jazz/src/AlsaPlayer.cpp
trunk/jazz/src/Command.cpp
trunk/jazz/src/ControlEdit.cpp
trunk/jazz/src/Dialogs.cpp
trunk/jazz/src/Events.h
trunk/jazz/src/Player.cpp
trunk/jazz/src/Track.cpp
trunk/jazz/src/Track.h
trunk/jazz/src/mswin/WindowsPlayer.cpp
Modified: trunk/jazz/src/AlsaPlayer.cpp
===================================================================
--- trunk/jazz/src/AlsaPlayer.cpp 2008-05-22 16:10:26 UTC (rev 557)
+++ trunk/jazz/src/AlsaPlayer.cpp 2008-05-22 18:16:07 UTC (rev 558)
@@ -467,8 +467,8 @@
tControl *k = pEvent->IsControl();
set_event_header(&ev, pEvent->GetClock(), SND_SEQ_EVENT_CONTROLLER);
ev.data.control.channel = k->GetChannel();
- ev.data.control.param = k->mControl;
- ev.data.control.value = k->mValue;
+ ev.data.control.param = k->GetControl();
+ ev.data.control.value = k->GetControlValue();
rc = write(&ev, now);
}
break;
Modified: trunk/jazz/src/Command.cpp
===================================================================
--- trunk/jazz/src/Command.cpp 2008-05-22 16:10:26 UTC (rev 557)
+++ trunk/jazz/src/Command.cpp 2008-05-22 18:16:07 UTC (rev 558)
@@ -766,10 +766,10 @@
tControl* pControl = pEvent->IsControl();
if (pControl)
{
- if (pControl->mControl == fr)
+ if (pControl->GetControl() == fr)
{
tControl* pControlCopy = (tControl *)pControl->Copy();
- pControlCopy->mControl = to;
+ pControlCopy->SetControl(to);
pTrack->Kill(pControl);
pTrack->Put(pControlCopy);
}
Modified: trunk/jazz/src/ControlEdit.cpp
===================================================================
--- trunk/jazz/src/ControlEdit.cpp 2008-05-22 16:10:26 UTC (rev 557)
+++ trunk/jazz/src/ControlEdit.cpp 2008-05-22 18:16:07 UTC (rev 558)
@@ -314,10 +314,12 @@
{
if (IsCtrlEdit(pEvent))
{
- if (Clock2Val(pEvent->GetClock()) != pEvent->IsControl()->mValue)
+ if (
+ Clock2Val(pEvent->GetClock()) !=
+ pEvent->IsControl()->GetControlValue())
{
pControlCopy = pEvent->Copy()->IsControl();
- pControlCopy->mValue = Clock2Val(pEvent->GetClock());
+ pControlCopy->SetControlValue(Clock2Val(pEvent->GetClock()));
track->Kill(pEvent);
track->Put(pControlCopy);
}
@@ -471,12 +473,12 @@
int tCtrlEdit::IsCtrlEdit(JZEvent* pEvent)
{
tControl* pControl = pEvent->IsControl();
- return (pControl && pControl->mControl == ctrl_num);
+ return (pControl && pControl->GetControl() == ctrl_num);
}
int tCtrlEdit::GetValue(JZEvent* pEvent)
{
- return pEvent->IsControl()->mValue;
+ return pEvent->IsControl()->GetControlValue();
}
JZEvent * tCtrlEdit::NewEvent(long clock, int val)
Modified: trunk/jazz/src/Dialogs.cpp
===================================================================
--- trunk/jazz/src/Dialogs.cpp 2008-05-22 16:10:26 UTC (rev 557)
+++ trunk/jazz/src/Dialogs.cpp 2008-05-22 18:16:07 UTC (rev 558)
@@ -848,21 +848,21 @@
};
-tControlDlg::tControlDlg(tControl *e, JZPianoWindow* w, JZTrack *t)
- : tChEventDlg(e, w, t)//,
+tControlDlg::tControlDlg(tControl* pControl, JZPianoWindow* w, JZTrack *t)
+ : tChEventDlg(pControl, w, t)//,
// Choice("Controller", &gpConfig->GetCtrlName(0), &Control)
{
- Event = e;
- Value = e->mValue;
- Control = e->mControl + 1;
+ Event = pControl;
+ Value = pControl->GetControlValue();
+ Control = pControl->GetControl() + 1;
}
bool tControlDlg::OnClose()
{
- ((tControl *)Copy)->mValue = Value;
+ ((tControl *)Copy)->SetControlValue(Value);
// Choice.GetValue();
- ((tControl *)Copy)->mControl = Control - 1;
+ ((tControl *)Copy)->SetControl(Control - 1);
return tChEventDlg::OnClose();
}
Modified: trunk/jazz/src/Events.h
===================================================================
--- trunk/jazz/src/Events.h 2008-05-22 16:10:26 UTC (rev 557)
+++ trunk/jazz/src/Events.h 2008-05-22 18:16:07 UTC (rev 558)
@@ -338,8 +338,6 @@
}
#endif
- public:
-
unsigned char GetStat() const
{
return mStat;
@@ -349,23 +347,24 @@
{
return mClock & ~KILLED_CLOCK;
}
- void SetClock(int c)
+
+ void SetClock(int Clock)
{
- mClock = c;
+ mClock = Clock;
}
- // the device is dynamically set when events are copied to
- // the playback queue (from the track device)
+ // The device is dynamically set when events are copied to the playback
+ // queue (from the track device).
enum
{
BROADCAST_DEVICE = 0
};
JZEvent(int Clock, unsigned char Stat)
+ : mStat(Stat),
+ mClock(Clock),
+ mDevice(BROADCAST_DEVICE)
{
- mClock = Clock;
- mStat = Stat;
- mDevice = BROADCAST_DEVICE;
#ifdef E_DBUG
Magic = MAGIC;
#endif
@@ -515,12 +514,13 @@
int mClock;
- private:
+ private:
int mDevice;
};
-
+//*****************************************************************************
+//*****************************************************************************
class tChannelEvent : public JZEvent
{
public:
@@ -558,8 +558,6 @@
unsigned char mChannel;
};
-
-
//*****************************************************************************
//*****************************************************************************
class tKeyOn : public tChannelEvent
@@ -685,7 +683,8 @@
unsigned short mOffVelocity;
};
-
+//*****************************************************************************
+//*****************************************************************************
class tKeyOff : public tChannelEvent
{
public:
@@ -740,7 +739,8 @@
unsigned char mOffVelocity;
};
-
+//*****************************************************************************
+//*****************************************************************************
class tPitch : public tChannelEvent
{
public:
@@ -809,27 +809,24 @@
}
};
-
-
+//*****************************************************************************
+//*****************************************************************************
class tControl : public tChannelEvent
{
public:
- unsigned char mControl;
- unsigned char mValue;
-
tControl(
int Clock,
int Channel,
- unsigned char ctl,
- unsigned char val)
- : tChannelEvent(Clock, StatControl, Channel)
+ unsigned char Control,
+ unsigned char Value)
+ : tChannelEvent(Clock, StatControl, Channel),
+ mControl(Control),
+ mValue(Value)
{
- mControl = ctl;
- mValue = val;
}
- virtual int Write(JZWriteBase &io)
+ virtual int Write(JZWriteBase& io)
{
edb();
return io.Write(this, mControl, mValue);
@@ -859,10 +856,10 @@
return mControl;
}
- virtual void SetPitch(int p)
+ virtual void SetPitch(int Pitch)
{
edb();
- mControl = p;
+ mControl = Pitch;
}
virtual const wxPen* GetPen() const
@@ -874,6 +871,31 @@
{
return wxCYAN_BRUSH;
}
+
+ unsigned char GetControl() const
+ {
+ return mControl;
+ }
+
+ void SetControl(unsigned char Control)
+ {
+ mControl = Control;
+ }
+
+ unsigned char GetControlValue() const
+ {
+ return mValue;
+ }
+
+ void SetControlValue(unsigned char Value)
+ {
+ mValue = Value;
+ }
+
+ private:
+
+ unsigned char mControl;
+ unsigned char mValue;
};
@@ -1525,7 +1547,8 @@
virtual int Write(JZWriteBase &io)
{
- edb(); return io.Write(this, Numerator, Denomiator, Clocks, Quarter);
+ edb();
+ return io.Write(this, Numerator, Denomiator, Clocks, Quarter);
}
virtual tTimeSignat* IsTimeSignat()
@@ -1550,7 +1573,8 @@
}
};
-//end of track JAVE new event(it is a standard type, i want it to define track loop points, as defined by the midi standard)
+// End of track JAVE new event(it is a standard type, i want
+// it to define track loop points, as defined by the midi standard)
class tEndOfTrack : public JZEvent
{
public:
@@ -1699,13 +1723,18 @@
edb();
return Value;
}
+
virtual int GetPitch() const
{
edb();
return 0;
}
- virtual void SetPitch(int v) { edb(); }
+ virtual void SetPitch(int v)
+ {
+ edb();
+ }
+
virtual const wxPen* GetPen() const
{
return wxGREEN_PEN;
Modified: trunk/jazz/src/Player.cpp
===================================================================
--- trunk/jazz/src/Player.cpp 2008-05-22 16:10:26 UTC (rev 557)
+++ trunk/jazz/src/Player.cpp 2008-05-22 18:16:07 UTC (rev 558)
@@ -1633,7 +1633,10 @@
pKeyOn->GetChannel(),
pKeyOn->GetKey(),
pKeyOn->GetVelocity());
- if (now) seqbuf_flush_last_event();
+ if (now)
+ {
+ seqbuf_flush_last_event();
+ }
}
break;
@@ -1645,14 +1648,20 @@
pKeyOff->GetChannel(),
pKeyOff->GetKey(),
pKeyOff->GetOffVelocity());
- if (now) seqbuf_flush_last_event();
+ if (now)
+ {
+ seqbuf_flush_last_event();
+ }
}
break;
case StatProgram:
{
tProgram* pProgram = pEvent->IsProgram();
SEQ_SET_PATCH(mididev, pProgram->GetChannel(), pProgram->GetProgram());
- if (now) seqbuf_flush_last_event();
+ if (now)
+ {
+ seqbuf_flush_last_event();
+ }
}
break;
@@ -1661,7 +1670,10 @@
{
tKeyPressure *k = pEvent->IsKeyPressure();
SEQ_KEY_PRESSURE(mididev, k->GetChannel(), k->Key, k->Value);
- if (now) seqbuf_flush_last_event();
+ if (now)
+ {
+ seqbuf_flush_last_event();
+ }
}
break;
//
@@ -1670,15 +1682,21 @@
{
tChnPressure *k = pEvent->IsChnPressure();
SEQ_CHN_PRESSURE(mididev, k->GetChannel(), k->Value);
- if (now) seqbuf_flush_last_event();
+ if (now)
+ {
+ seqbuf_flush_last_event();
+ }
}
break;
case StatControl:
{
tControl *k = pEvent->IsControl();
- SEQ_CONTROL(mididev, k->GetChannel(), k->mControl, k->mValue);
- if (now) seqbuf_flush_last_event();
+ SEQ_CONTROL(mididev, k->GetChannel(), k->GetControl(), k->GetControlValue());
+ if (now)
+ {
+ seqbuf_flush_last_event();
+ }
}
break;
@@ -1686,7 +1704,10 @@
{
tPitch *k = pEvent->IsPitch();
SEQ_BENDER(mididev, k->GetChannel(), k->Value + 8192);
- if (now) seqbuf_flush_last_event();
+ if (now)
+ {
+ seqbuf_flush_last_event();
+ }
}
break;
Modified: trunk/jazz/src/Track.cpp
===================================================================
--- trunk/jazz/src/Track.cpp 2008-05-22 16:10:26 UTC (rev 557)
+++ trunk/jazz/src/Track.cpp 2008-05-22 18:16:07 UTC (rev 558)
@@ -246,14 +246,14 @@
}
tDrumInstrumentParameter::tDrumInstrumentParameter(tNrpn *par)
- : mPitch(par->mLsb.mValue),
+ : mPitch(par->mLsb.GetControlValue()),
mpNext(0)
{
for (int i = drumPitchIndex; i < numDrumParameters; i++)
{
param[i] = 0;
}
- param[drumParam2Index(par->mMsb.mValue)] = par;
+ param[drumParam2Index(par->mMsb.GetControlValue())] = par;
}
tNrpn *tDrumInstrumentParameter::Get(int index)
@@ -264,7 +264,7 @@
void tDrumInstrumentParameter::Put(tNrpn *par)
{
- param[par->mLsb.mValue] = par;
+ param[par->mLsb.GetControlValue()] = par;
}
tDrumInstrumentParameter *tDrumInstrumentParameter::Next()
@@ -304,7 +304,7 @@
void tDrumInstrumentParameterList::PutParam(tNrpn *par)
{
- tDrumInstrumentParameter* ptr = GetElem(par->mLsb.mValue);
+ tDrumInstrumentParameter* ptr = GetElem(par->mLsb.GetControlValue());
if (!ptr)
{
ptr = new tDrumInstrumentParameter(par);
@@ -313,7 +313,7 @@
}
else
{
- ptr->param[drumParam2Index(par->mMsb.mValue)] = par;
+ ptr->param[drumParam2Index(par->mMsb.GetControlValue())] = par;
}
}
@@ -847,7 +847,7 @@
}
if ((pControl = e->IsControl()) != 0)
{
- switch (pControl->mControl)
+ switch (pControl->GetControl())
{
case 0x07:
if (!Volume)
@@ -1388,7 +1388,7 @@
WrittenBefore = 0;
if (e->IsControl())
{
- switch (e->IsControl()->mControl)
+ switch (e->IsControl()->GetControl())
{
// Don't write these again if present as events
// and clock == 0 (should not happen)
@@ -1459,22 +1459,22 @@
}
if (e->IsControl())
{
- switch (e->IsControl()->mControl)
+ switch (e->IsControl()->GetControl())
{
// Grab Rpn/Nrpn/Bank from file and save them, don't put
// them into event-array
case 0x63:
case 0x65:
- Msb = e->IsControl()->mValue; // Rpn/Nrpn Msb
+ Msb = e->IsControl()->GetControlValue(); // Rpn/Nrpn Msb
SpecialEvent = 1;
break;
case 0x62:
case 0x64:
- Lsb = e->IsControl()->mValue; // Rpn/Nrpn Lsb
+ Lsb = e->IsControl()->GetControlValue(); // Rpn/Nrpn Lsb
SpecialEvent = 1;
break;
case 0x06:
- Data = e->IsControl()->mValue; // Rpn/Nrpn Data
+ Data = e->IsControl()->GetControlValue(); // Rpn/Nrpn Data
SpecialEvent = 1;
cha = e->IsControl()->GetChannel();
switch (Msb)
@@ -2171,7 +2171,7 @@
{
if (Volume)
{
- return Volume->mValue + 1;
+ return Volume->GetControlValue() + 1;
}
return 0;
}
@@ -2193,13 +2193,17 @@
bool JZTrack::DecreaseVolume()
{
- if (Volume && Volume->mValue > 0)
+ if (Volume && Volume->GetControlValue() > 0)
{
Kill(Volume);
- --Volume->mValue;
+ Volume->SetControlValue(Volume->GetControlValue() - 1);
- JZEvent* pEvent = new tControl(0, Channel - 1, 0x07, Volume->mValue);
+ JZEvent* pEvent = new tControl(
+ 0,
+ Channel - 1,
+ 0x07,
+ Volume->GetControlValue());
Put(pEvent);
gpMidiPlayer->OutNow(this, pEvent);
@@ -2212,13 +2216,18 @@
bool JZTrack::IncreaseVolume()
{
- if (Volume && Volume->mValue < 127)
+ if (Volume && Volume->GetControlValue() < 127)
{
Kill(Volume);
- ++Volume->mValue;
+ Volume->SetControlValue(Volume->GetControlValue() + 1);
- JZEvent* pEvent = new tControl(0, Channel - 1, 0x07, Volume->mValue);
+ JZEvent* pEvent = new tControl(
+ 0,
+ Channel - 1,
+ 0x07,
+ Volume->GetControlValue());
+
Put(pEvent);
gpMidiPlayer->OutNow(this, pEvent);
@@ -2235,7 +2244,7 @@
{
if (Pan)
{
- return Pan->mValue + 1;
+ return Pan->GetControlValue() + 1;
}
return 0;
}
@@ -2261,7 +2270,7 @@
{
if (Reverb)
{
- return Reverb->mValue + 1;
+ return Reverb->GetControlValue() + 1;
}
return 0;
}
@@ -2287,7 +2296,7 @@
{
if (Chorus)
{
- return Chorus->mValue + 1;
+ return Chorus->GetControlValue() + 1;
}
return 0;
}
@@ -2317,7 +2326,7 @@
if (mpBank)
{
DEBUG(fprintf(stderr,"Bank %d selected.\n\n",mpBank->Value);)
- return mpBank->mValue;
+ return mpBank->GetControlValue();
}
else
{
@@ -2330,8 +2339,8 @@
for (int i=0; gpConfig->BankEntry(i).Command[0]>=0; i++)
{
if (
- gpConfig->BankEntry(i).Command[0] == mpBank->mValue &&
- gpConfig->BankEntry(i).Command[1] == mpBank2->mValue)
+ gpConfig->BankEntry(i).Command[0] == mpBank->GetControlValue() &&
+ gpConfig->BankEntry(i).Command[1] == mpBank2->GetControlValue())
{
DEBUG(fprintf(stderr,"Bank %d selected.\n\n",i);)
return i;
Modified: trunk/jazz/src/Track.h
===================================================================
--- trunk/jazz/src/Track.h 2008-05-22 16:10:26 UTC (rev 557)
+++ trunk/jazz/src/Track.h 2008-05-22 18:16:07 UTC (rev 558)
@@ -101,7 +101,7 @@
virtual int GetVal()
{
- return mDataMsb.mValue;
+ return mDataMsb.GetValue();
}
tControl mMsb;
Modified: trunk/jazz/src/mswin/WindowsPlayer.cpp
===================================================================
--- trunk/jazz/src/mswin/WindowsPlayer.cpp 2008-05-22 16:10:26 UTC (rev 557)
+++ trunk/jazz/src/mswin/WindowsPlayer.cpp 2008-05-22 18:16:07 UTC (rev 558)
@@ -303,8 +303,8 @@
{
tControl* pControl = pEvent->IsControl();
u.c[0] = 0xB0 | pControl->GetChannel();
- u.c[1] = pControl->mControl;
- u.c[2] = pControl->mValue;
+ u.c[1] = pControl->GetControl();
+ u.c[2] = pControl->GetControlValue();
}
break;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
