SF.net SVN: jazzplusplus: [474] trunk/jazz/src

[<pst...@us...>]

Revision: 474
          http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=474&view=rev
Author:   pstieber
Date:     2008-04-21 21:38:39 -0700 (Mon, 21 Apr 2008)

Log Message:
-----------
1. Added a drum set container accessor to the configuration class.
2. Added more code to the track dialog.
3. Changed tMetaEvent::Data to mpData.
4. Made cosmetic changes to the synthesizer class.

Modified Paths:
--------------
    trunk/jazz/src/Configuration.h
    trunk/jazz/src/Dialogs/TrackDialog.cpp
    trunk/jazz/src/Dialogs.cpp
    trunk/jazz/src/Events.h
    trunk/jazz/src/Synth.cpp
    trunk/jazz/src/Track.cpp
    trunk/jazz/src/Track.h
    trunk/jazz/src/TrackWindow.cpp
    trunk/jazz/src/mswin/WindowsPlayer.cpp

Modified: trunk/jazz/src/Configuration.h
===================================================================
--- trunk/jazz/src/Configuration.h	2008-04-21 13:49:25 UTC (rev 473)
+++ trunk/jazz/src/Configuration.h	2008-04-22 04:38:39 UTC (rev 474)
@@ -244,6 +244,8 @@
     bool Put(int entry);
     bool Put(int entry, int value);
 
+    const std::vector<std::pair<std::string, int> >& GetDrumSets() const;
+
     const std::vector<std::pair<std::string, int> >& GetDrumNames() const;
 
     const std::vector<std::pair<std::string, int> >& GetControlNames() const;
@@ -301,6 +303,15 @@
 //-----------------------------------------------------------------------------
 inline
 const std::vector<std::pair<std::string, int> >&
+JZConfiguration::GetDrumSets() const
+{
+  return mDrumSets;
+}
+
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+inline
+const std::vector<std::pair<std::string, int> >&
 JZConfiguration::GetDrumNames() const
 {
   return mDrumNames;

Modified: trunk/jazz/src/Dialogs/TrackDialog.cpp
===================================================================
--- trunk/jazz/src/Dialogs/TrackDialog.cpp	2008-04-21 13:49:25 UTC (rev 473)
+++ trunk/jazz/src/Dialogs/TrackDialog.cpp	2008-04-22 04:38:39 UTC (rev 474)
@@ -38,20 +38,20 @@
   mpTrackNameEdit = new wxTextCtrl(this, wxID_ANY);
 
   mpPatchListBox = new wxListBox(this, wxID_ANY);
-  if (Track.IsDrumTrack())
+  if (mTrack.IsDrumTrack())
   {
-    const vector<pair<string, int> >& DrumNames = gpConfig->GetDrumNames();
+    const vector<pair<string, int> >& DrumSets = gpConfig->GetDrumSets();
     for (
-      vector<pair<string, int> >::const_iterator iDrumName =
-        DrumNames.begin();
-      iDrumName != DrumNames.end();
-      ++iDrumName)
+      vector<pair<string, int> >::const_iterator iDrumSet =
+        DrumSets.begin();
+      iDrumSet != DrumSets.end();
+      ++iDrumSet)
     {
-      const string& DrumName = iDrumName->first;
+      const string& DrumSet = iDrumSet->first;
 
-      if (!DrumName.empty())
+      if (!DrumSet.empty())
       {
-        mpPatchListBox->Append(DrumName.c_str());
+        mpPatchListBox->Append(DrumSet.c_str());
       }
     }
   }
@@ -84,15 +84,15 @@
     new wxStaticText(this, wxID_ANY, "Track Name:"),
     0,
     wxALL,
-    2);
-  pTopSizer->Add(mpTrackNameEdit, 0, wxGROW | wxALL, 2);
+    4);
+  pTopSizer->Add(mpTrackNameEdit, 0, wxGROW | wxALL, 4);
 
   pTopSizer->Add(
     new wxStaticText(this, wxID_ANY, "Patch:"),
     0,
     wxALL,
-    2);
-  pTopSizer->Add(mpPatchListBox, 0, wxGROW | wxALL, 2);
+    4);
+  pTopSizer->Add(mpPatchListBox, 0, wxGROW | wxALL, 4);
 
   wxBoxSizer* pButtonSizer = new wxBoxSizer(wxHORIZONTAL);
   pButtonSizer->Add(pOkButton, 0, wxALL, 5);
@@ -114,6 +114,9 @@
 {
   mpTrackNameEdit->ChangeValue(mTrack.GetName());
 
+  int PatchIndex = mTrack.GetPatch() + (mTrack.GetBank() << 8);
+  mpPatchListBox->SetSelection(PatchIndex);
+
   return true;
 }
 
@@ -121,5 +124,17 @@
 //-----------------------------------------------------------------------------
 bool JZTrackDialog::TransferDataFromWindow()
 {
+  wxString Trackname = mpTrackNameEdit->GetValue();
+  mTrack.SetName(Trackname.c_str());
+
+  int Selection = mpPatchListBox->GetSelection();
+  if (Selection != wxNOT_FOUND)
+  {
+    int Patch = Selection & 0x000000ff;;
+    int Bank = (Selection & 0x0000ff00) >> 8;
+    mTrack.SetPatch(Patch);
+    mTrack.SetBank(Bank);
+  }
+
   return true;
 }

Modified: trunk/jazz/src/Dialogs.cpp
===================================================================
--- trunk/jazz/src/Dialogs.cpp	2008-04-21 13:49:25 UTC (rev 473)
+++ trunk/jazz/src/Dialogs.cpp	2008-04-22 04:38:39 UTC (rev 474)
@@ -1152,8 +1152,8 @@
 
   for (int i = 0; i < s->Length; i++)
   {
-     sprintf( hexbyte, "%02x ", s->Data[i] );
-     strcat( str, hexbyte );
+    sprintf(hexbyte, "%02x ", s->mpData[i]);
+    strcat(str, hexbyte);
   }
 }
 
@@ -1245,7 +1245,7 @@
       ostringstream Oss;
       Oss
         << "First data byte is at offset "
-        << uptr - Event->IsSysEx()->Data + 1 << ", value "
+        << uptr - Event->IsSysEx()->mpData + 1 << ", value "
         << setw(2) << hex << static_cast<int>(*uptr)
         << dec << " (" << static_cast<int>(*uptr) << " decimal)";
       sheet->AddProperty(new wxProperty(

Modified: trunk/jazz/src/Events.h
===================================================================
--- trunk/jazz/src/Events.h	2008-04-21 13:49:25 UTC (rev 473)
+++ trunk/jazz/src/Events.h	2008-04-22 04:38:39 UTC (rev 474)
@@ -861,27 +861,32 @@
 {
   public:
 
-    unsigned char* Data;
+    unsigned char* mpData;
     unsigned short Length;
 
-    tMetaEvent(int clk, unsigned char sta, unsigned char *dat, unsigned short len)
+    tMetaEvent(
+      int clk,
+      unsigned char sta,
+      unsigned char* dat,
+      unsigned short len)
       : JZEvent(clk, sta)
     {
       Length = len;
-      Data = new unsigned char [len + 1];
+      mpData = new unsigned char [len + 1];
       if (dat)
-        memcpy(Data, dat, len);
-      Data[len] = 0;
+        memcpy(mpData, dat, len);
+      mpData[len] = 0;
     }
 
     virtual ~tMetaEvent()
     {
-      delete [] Data;
+      delete [] mpData;
     }
 
     virtual int Write(JZWriteBase &io)
     {
-      edb(); return io.Write(this, Data, Length);
+      edb();
+      return io.Write(this, mpData, Length);
     }
 
     virtual tMetaEvent* IsMetaEvent()
@@ -893,7 +898,7 @@
     virtual JZEvent* Copy() const
     {
       edb();
-      return new tMetaEvent(mClock, Stat, Data, Length);
+      return new tMetaEvent(mClock, Stat, mpData, Length);
     }
 };
 
@@ -910,44 +915,50 @@
       : tMetaEvent(clk, StatJazzMeta, dat, len)
     {
     }
-    tJazzMeta() : tMetaEvent(0, StatJazzMeta, 0, DATALEN) {
-      memset(Data, 0, DATALEN);
-      memcpy(Data, "JAZ2", 4);
-      Data[4] = 1; // version or so
+    tJazzMeta()
+      : tMetaEvent(0, StatJazzMeta, 0, DATALEN)
+    {
+      memset(mpData, 0, DATALEN);
+      memcpy(mpData, "JAZ2", 4);
+      mpData[4] = 1; // version or so
     }
-    char GetAudioMode() const {
-      return Data[5];
+    char GetAudioMode() const
+    {
+      return mpData[5];
     }
-    void SetAudioMode(char c) {
-      Data[5] = c;
+    void SetAudioMode(char c)
+    {
+      mpData[5] = c;
     }
-    char GetTrackState() const {
-      return Data[6];
+    char GetTrackState() const
+    {
+      return mpData[6];
     }
-    void SetTrackState(char c) {
-      Data[6] = c;
+    void SetTrackState(char c)
+    {
+      mpData[6] = c;
     }
 
-    // Data[7] is unused
+    // mpData[7] is unused
 
     unsigned char GetTrackDevice() const
     {
-      return Data[8];
+      return mpData[8];
     }
 
     void SetTrackDevice(unsigned char x)
     {
-      Data[8] = x;
+      mpData[8] = x;
     }
 
     unsigned char GetIntroLength() const
     {
-      return Data[9];
+      return mpData[9];
     }
 
     void SetIntroLength(unsigned char x)
     {
-      Data[9] = x;
+      mpData[9] = x;
     }
 
     virtual tJazzMeta* IsJazzMeta()
@@ -959,7 +970,7 @@
     virtual JZEvent* Copy() const
     {
       edb();
-      return new tJazzMeta(mClock, Data, Length);
+      return new tJazzMeta(mClock, mpData, Length);
     }
 };
 
@@ -982,7 +993,7 @@
     virtual JZEvent* Copy() const
     {
       edb();
-      return new tSysEx(mClock, Data, Length);
+      return new tSysEx(mClock, mpData, Length);
     }
 
     // todo
@@ -1007,7 +1018,7 @@
     virtual JZEvent* Copy() const
     {
       edb();
-      return new tSongPtr(mClock, Data, Length);
+      return new tSongPtr(mClock, mpData, Length);
     }
 };
 
@@ -1033,7 +1044,7 @@
     virtual JZEvent* Copy() const
     {
       edb();
-      return new tMidiClock(mClock, Data, Length);
+      return new tMidiClock(mClock, mpData, Length);
     }
 };
 
@@ -1057,7 +1068,7 @@
     virtual JZEvent* Copy() const
     {
       edb();
-      return new tStartPlay(mClock, Data, Length);
+      return new tStartPlay(mClock, mpData, Length);
     }
 };
 
@@ -1083,7 +1094,7 @@
     virtual JZEvent* Copy() const
     {
       edb();
-      return new tContPlay(mClock, Data, Length);
+      return new tContPlay(mClock, mpData, Length);
     }
 };
 
@@ -1110,7 +1121,7 @@
     virtual JZEvent* Copy() const
     {
       edb();
-      return new tStopPlay(mClock, Data, Length);
+      return new tStopPlay(mClock, mpData, Length);
     }
 };
 
@@ -1134,12 +1145,12 @@
     virtual JZEvent* Copy() const
     {
       edb();
-      return new tText(mClock, Data, Length);
+      return new tText(mClock, mpData, Length);
     }
 
     virtual unsigned char* GetText()
     {
-      return Data;
+      return mpData;
     }
 };
 
@@ -1163,7 +1174,7 @@
     virtual JZEvent* Copy() const
     {
       edb();
-      return new tCopyright(mClock, Data, Length);
+      return new tCopyright(mClock, mpData, Length);
     }
 };
 
@@ -1181,7 +1192,7 @@
       // clip to 16 chars
       if (len > 16)
       {
-        Data[16] = 0;
+        mpData[16] = 0;
         Length   = 16;
       }
 #endif
@@ -1197,7 +1208,7 @@
     virtual JZEvent* Copy() const
     {
       edb();
-      return new tTrackName(mClock, Data, Length);
+      return new tTrackName(mClock, mpData, Length);
     }
 };
 
@@ -1221,7 +1232,7 @@
     virtual JZEvent* Copy() const
     {
       edb();
-      return new tMarker(mClock, Data, Length);
+      return new tMarker(mClock, mpData, Length);
     }
 };
 
@@ -1278,16 +1289,16 @@
 
     virtual int Write(JZWriteBase &io)
     {
-      Data = new unsigned char [Length + 1];
-      int* dat = (int *)Data;
+      mpData = new unsigned char [Length + 1];
+      int* dat = (int *)mpData;
       dat[0] = track;
       dat[1] = transpose;
       dat[2] = eventlength;
       Length = sizeof(int) * 3;
       edb();
 
-      Data[Length] = 0;
-      return io.Write(this, Data, Length);
+      mpData[Length] = 0;
+      return io.Write(this, mpData, Length);
     }
 
     virtual tPlayTrack* IsPlayTrack()
@@ -1388,7 +1399,7 @@
     virtual JZEvent* Copy() const
     {
       edb();
-      return new tMtcOffset(mClock, Data, Length);
+      return new tMtcOffset(mClock, mpData, Length);
     }
 };
 

Modified: trunk/jazz/src/Synth.cpp
===================================================================
--- trunk/jazz/src/Synth.cpp	2008-04-21 13:49:25 UTC (rev 473)
+++ trunk/jazz/src/Synth.cpp	2008-04-22 04:38:39 UTC (rev 474)
@@ -25,7 +25,6 @@
 #include "Synth.h"
 
 #include "Track.h"
-//#include "util.h"
 #include "Player.h"
 #include "JazzPlusPlusApplication.h"
 //#include "eventwin.h"
@@ -340,37 +339,37 @@
 
   gs_dt1[4] = 0x40;
   gs_dt1[5] = 0x20;
-  for ( i = 0; i < 11; i++ )
+  for (i = 0; i < 11; i++)
   {
     gs_dt1[6] = 0x00 + i;
     SXDECL(SX_GS_ModPitch + i, GS_DT1_LEN, gs_dt1);
   }
 
-  for ( i = 0; i < 11; i++ )
+  for (i = 0; i < 11; i++)
   {
     gs_dt1[6] = 0x10 + i;
     SXDECL(SX_GS_BendPitch + i, GS_DT1_LEN, gs_dt1);
   }
 
-  for ( i = 0; i < 11; i++ )
+  for (i = 0; i < 11; i++)
   {
     gs_dt1[6] = 0x20 + i;
     SXDECL(SX_GS_CafPitch + i, GS_DT1_LEN, gs_dt1);
   }
 
-  for ( i = 0; i < 11; i++ )
+  for (i = 0; i < 11; i++)
   {
     gs_dt1[6] = 0x30 + i;
     SXDECL(SX_GS_PafPitch + i, GS_DT1_LEN, gs_dt1);
   }
 
-  for ( i = 0; i < 11; i++ )
+  for (i = 0; i < 11; i++)
   {
     gs_dt1[6] = 0x40 + i;
     SXDECL(SX_GS_CC1Pitch + i, GS_DT1_LEN, gs_dt1);
   }
 
-  for ( i = 0; i < 11; i++ )
+  for (i = 0; i < 11; i++)
   {
     gs_dt1[6] = 0x50 + i;
     SXDECL(SX_GS_CC2Pitch + i, GS_DT1_LEN, gs_dt1);
@@ -378,19 +377,44 @@
 
   gs_dt1[4] = 0x40;
   gs_dt1[5] = 0x01;
-  for ( i = 0; i < 7; i++ )
+  for (i = 0; i < 7; i++)
   {
     gs_dt1[6] = 0x30 + i;
     SXDECL(SX_GS_ReverbMacro + i, GS_DT1_LEN, gs_dt1);
   }
 
-  for ( i = 0; i < 8; i++ )
+  for (i = 0; i < 8; i++)
   {
     gs_dt1[6] = 0x38 + i;
     SXDECL(SX_GS_ChorusMacro + i, GS_DT1_LEN, gs_dt1);
   }
 
-  const unsigned char gs_partial_reserve[] = {GS_DT1,0x40,0x01,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf7};
+  const unsigned char gs_partial_reserve[] =
+  {
+    GS_DT1,
+    0x40,
+    0x01,
+    0x10,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0x00,
+    0xf7
+  };
+
   SXDECL(SX_GS_PartialReserve, GS_DT1_LEN, gs_partial_reserve);
 
   gs_dt1[4] = 0x40;
@@ -413,8 +437,6 @@
   gs_dt1[6] = 0x20;
   SXDECL(SX_GS_CC2CtrlNo, GS_DT1_LEN, gs_dt1);
 
-
-
   // XG native
   const unsigned char xg_on[] = {XG_NAT,0x00,0x00,0x7e,0x00,0xf7};
   SXDECL(SX_XG_ON, XG_NAT_LEN, xg_on);
@@ -422,13 +444,13 @@
   // XG native multipart
   unsigned char xg_multi[] = {XG_NAT,0x08,0x00,0x00,0x00,0x7f};
 
-  for ( i = 0; i < 12; i++ )
+  for (i = 0; i < 12; i++)
   {
     xg_multi[5] = 0x1d + i;
     SXDECL(SX_XG_ModPitch + i, XG_NAT_LEN, xg_multi);
   }
 
-  for ( i = 0; i < 26; i++ )
+  for (i = 0; i < 26; i++)
   {
     xg_multi[5] = 0x4d + i;
     SXDECL(SX_XG_CafPitch + i, XG_NAT_LEN, xg_multi);
@@ -470,11 +492,11 @@
    if (!s)
       return SX_NONE;
 
-   switch (s->Data[0])
+   switch (s->mpData[0])
    {
     case 0x7e:
        // GM ON ?
-       if (!memcmp(sxdata[SX_GM_ON], s->Data, s->Length))
+       if (!memcmp(sxdata[SX_GM_ON], s->mpData, s->Length))
        {
          return SX_GM_ON;
        }
@@ -486,7 +508,7 @@
 
     case 0x7f:
        // GM MasterVol ?
-       if (!memcmp(sxdata[SX_GM_MasterVol],s->Data,4))
+       if (!memcmp(sxdata[SX_GM_MasterVol], s->mpData, 4))
        {
          return SX_GM_MasterVol;
        }
@@ -500,11 +522,11 @@
        // Roland!
 
        // GS DT1?
-       if ((s->Data[2] == 0x42) && (s->Data[3] == 0x12))
+       if ((s->mpData[2] == 0x42) && (s->mpData[3] == 0x12))
        {
-         register unsigned char a1 = s->Data[4];
-         register unsigned char a2 = s->Data[5];
-         register unsigned char a3 = s->Data[6];
+         register unsigned char a1 = s->mpData[4];
+         register unsigned char a2 = s->mpData[5];
+         register unsigned char a3 = s->mpData[6];
 
          if (a1 == 0x40)
          {
@@ -536,7 +558,7 @@
              else if (a3 == 0x10)
                return SX_GS_PartialReserve;
            }
-           else if ( (a2 & 0xf0) == 0x10 )
+           else if ((a2 & 0xf0) == 0x10)
            {
              // 0x40 0x1n 0x??
              switch (a3)
@@ -556,7 +578,7 @@
                break;
              }
            }
-           else if ( (a2 & 0xf0) == 0x20 )
+           else if ((a2 & 0xf0) == 0x20)
            {
              // 0x40 0x2n 0x??
              if (a3 <= 0x0a)
@@ -575,11 +597,11 @@
          } // end a1 == 0x40
        } // end GS DT1
 
-       if ((s->Data[3] == 0x12) && (s->Length >= 10))
+       if ((s->mpData[3] == 0x12) && (s->Length >= 10))
        {
          return SX_ROLAND_DT1;
        }
-       else if ((s->Data[3] == 0x11) && (s->Length >= 12))
+       else if ((s->mpData[3] == 0x11) && (s->Length >= 12))
        {
          return SX_ROLAND_RQ1;
        }
@@ -593,11 +615,11 @@
     case 0x43:
       // Yamaha!
       // XG Native?
-      if (((s->Data[1] & 0xf0) == 0x10) && (s->Data[2] == 0x4c))
+      if (((s->mpData[1] & 0xf0) == 0x10) && (s->mpData[2] == 0x4c))
       {
-        register unsigned char a1 = s->Data[3];
-        register unsigned char a2 = s->Data[4];
-        register unsigned char a3 = s->Data[5];
+        register unsigned char a1 = s->mpData[3];
+        register unsigned char a2 = s->mpData[4];
+        register unsigned char a3 = s->mpData[5];
 
         // Multipart?
         if (a1 == 0x08)
@@ -648,11 +670,11 @@
         }
       }
 
-      if (s->Data[2] == 0x4c)
+      if (s->mpData[2] == 0x4c)
       {
         return SX_XG_NATIVE;
       }
-      else if (s->Data[2] == 0x49)
+      else if (s->mpData[2] == 0x49)
       {
         return SX_MU80_NATIVE;
       }
@@ -679,38 +701,38 @@
     return 0;
   }
 
-  switch (s->Data[0])
+  switch (s->mpData[0])
   {
     case 0x7f:
       // GM MasterVol?
-      if (!memcmp(sxdata[SX_GM_MasterVol],s->Data,4))
+      if (!memcmp(sxdata[SX_GM_MasterVol], s->mpData,4))
       {
-        return &s->Data[4];
+        return &s->mpData[4];
       }
       break;
 
     case 0x41:
       // Roland!
       // GS DT1?
-      if ((s->Data[2] == 0x42) && (s->Data[3] == 0x12) && (s->Length >= 10))
+      if ((s->mpData[2] == 0x42) && (s->mpData[3] == 0x12) && (s->Length >= 10))
       {
-        return &s->Data[7];
+        return &s->mpData[7];
       }
       // other DT1 or RQ1 ?
       else if (
-        ((s->Data[3] == 0x12) && (s->Length >= 10)) ||
-        ((s->Data[3] == 0x11) && (s->Length >= 12)))
+        ((s->mpData[3] == 0x12) && (s->Length >= 10)) ||
+        ((s->mpData[3] == 0x11) && (s->Length >= 12)))
       {
-        return &s->Data[7];
+        return &s->mpData[7];
       }
       break;
 
     case 0x43:
       // Yamaha!
       // XG Native?
-      if (((s->Data[1] & 0xf0) == 0x10) && (s->Data[2] == 0x4c))
+      if (((s->mpData[1] & 0xf0) == 0x10) && (s->mpData[2] == 0x4c))
       {
-        return &s->Data[6];
+        return &s->mpData[6];
       }
       break;
     default:
@@ -730,17 +752,21 @@
       return 0;
    }
 
-   switch (s->Data[0])
+   switch (s->mpData[0])
    {
     case 0x41:
        // Roland!
        // GS DT1 + address 0x40?
-       if ((s->Data[2] == 0x42) && (s->Data[3] == 0x12) &&
-           (s->Data[4] == 0x40))
+       if (
+         (s->mpData[2] == 0x42) &&
+         (s->mpData[3] == 0x12) &&
+         (s->mpData[4] == 0x40))
        {
-         if ( ((s->Data[5] & 0xf0) == 0x10 ) || ((s->Data[5] & 0xf0) == 0x20 ) )
+         if (
+           ((s->mpData[5] & 0xf0) == 0x10) ||
+           ((s->mpData[5] & 0xf0) == 0x20))
          {
-           return &s->Data[5];
+           return &s->mpData[5];
          }
        }
        break;
@@ -748,9 +774,12 @@
     case 0x43:
        // Yamaha!
        // XG Native multipart?
-       if (((s->Data[1] & 0xf0) == 0x10) && (s->Data[2] == 0x4c) && (s->Data[3] == 0x08))
+       if (
+         ((s->mpData[1] & 0xf0) == 0x10) &&
+         (s->mpData[2] == 0x4c) &&
+         (s->mpData[3] == 0x08))
        {
-         return &s->Data[4];
+         return &s->mpData[4];
        }
        break;
     default:
@@ -763,16 +792,16 @@
 
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
-void tSynthSysex::FixCheckSum( tSysEx *s )
+void tSynthSysex::FixCheckSum(tSysEx* s)
 {
   if (
-    (s->Data[0] == 0x41) &&
-    (((s->Data[3] == 0x12) && (s->Length >= 10)) ||
-      ((s->Data[3] == 0x11) && (s->Length >= 12))))
+    (s->mpData[0] == 0x41) &&
+    (((s->mpData[3] == 0x12) && (s->Length >= 10)) ||
+      ((s->mpData[3] == 0x11) && (s->Length >= 12))))
   {
     // Roland RQ1 or DT1
     int len = s->Length;
-    unsigned char *sx = s->Data;
+    unsigned char *sx = s->mpData;
     unsigned char sum = 0x00;
 
     for (int i = 4; i < (len-2); i++)
@@ -793,7 +822,11 @@
 
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
-tSysEx* tSynthSysex::operator()(long clk, int id, int datalen, unsigned char val[])
+tSysEx* tSynthSysex::operator()(
+  long clk,
+  int id,
+  int datalen,
+  unsigned char val[])
 {
   return (*this)(clk, id, -1, datalen, val);
 }
@@ -807,18 +840,18 @@
   int datalen,
   unsigned char val[])
 {
-  assert( (id > SX_NONE) && (id < NumSysexIds) );
-  assert( datalen > 0 );
+  assert((id > SX_NONE) && (id < NumSysexIds));
+  assert(datalen > 0);
 
   int i;
   for (i = 0; i < datalen; i++)
   {
-    assert( val[i] < 128 );
+    assert(val[i] < 128);
   }
 
    int len = sxlen[id] + datalen - 1;
    unsigned char* sx = new unsigned char[len];
-   memcpy( sx, sxdata[id], sxlen[id] );
+   memcpy(sx, sxdata[id], sxlen[id]);
    tSysEx* s = 0;
 
    if (id == SX_GM_MasterVol)
@@ -829,7 +862,7 @@
       else
         sx[4] = 0;
       sx[5] = val[0]; // MSB
-      s = new tSysEx( clk, sx, len );
+      s = new tSysEx(clk, sx, len);
    }
    else if ((id > SX_GS_ON) && (id < SX_XG_ON))
    {
@@ -839,7 +872,7 @@
 
       if (channel >= 0)
       {
-        sx[5] = sx[5] | sysex_channel( channel );
+        sx[5] = sx[5] | sysex_channel(channel);
       }
 
       unsigned char sum = 0x00;
@@ -847,20 +880,22 @@
         sum += sx[i];
       sx[len - 2] = (0x80 - (sum & 0x7f)) & 0x7f;
       sx[len-1] = 0xf7;
-      s = new tSysEx( clk, sx, len );
+      s = new tSysEx(clk, sx, len);
    }
    else if (id > SX_XG_ON)
    {
       // XG Native
       for (i = 0; i < datalen; i++)
+      {
         sx[i+6] = val[i];
+      }
 
       if (channel >= 0)
       {
         sx[4] = channel - 1;
       }
       sx[len-1] = 0xf7;
-      s = new tSysEx( clk, sx, len );
+      s = new tSysEx(clk, sx, len);
    }
 
    delete sx;
@@ -868,194 +903,194 @@
 }
 
 
-JZEvent* tGS::MasterVolSX( long clk, unsigned char vol )
+JZEvent* tGS::MasterVolSX(long clk, unsigned char vol)
 {
-   return Sysex( clk, SX_GS_MasterVol, vol );
+   return Sysex(clk, SX_GS_MasterVol, vol);
 }
 
-JZEvent* tGS::MasterPanSX( long clk, unsigned char pan )
+JZEvent* tGS::MasterPanSX(long clk, unsigned char pan)
 {
-   return Sysex( clk, SX_GS_MasterPan, pan );
+   return Sysex(clk, SX_GS_MasterPan, pan);
 }
 
-JZEvent* tGS::ModSX( int index, long clk, int cha, unsigned char val )
+JZEvent* tGS::ModSX(int index, long clk, int cha, unsigned char val)
 {
-   return Sysex( clk, SX_GS_ModPitch + index, cha, 1, &val );
+   return Sysex(clk, SX_GS_ModPitch + index, cha, 1, &val);
 }
 
-JZEvent* tGS::BendSX( int index, long clk, int cha, unsigned char val )
+JZEvent* tGS::BendSX(int index, long clk, int cha, unsigned char val)
 {
-   return Sysex( clk, SX_GS_BendPitch + index, cha, 1, &val );
+   return Sysex(clk, SX_GS_BendPitch + index, cha, 1, &val);
 }
 
-JZEvent* tGS::CafSX( int index, long clk, int cha, unsigned char val )
+JZEvent* tGS::CafSX(int index, long clk, int cha, unsigned char val)
 {
-   return Sysex( clk, SX_GS_CafPitch + index, cha, 1, &val );
+   return Sysex(clk, SX_GS_CafPitch + index, cha, 1, &val);
 }
 
-JZEvent* tGS::PafSX( int index, long clk, int cha, unsigned char val )
+JZEvent* tGS::PafSX(int index, long clk, int cha, unsigned char val)
 {
-   return Sysex( clk, SX_GS_PafPitch + index, cha, 1, &val );
+   return Sysex(clk, SX_GS_PafPitch + index, cha, 1, &val);
 }
 
-JZEvent* tGS::CC1SX( int index, long clk, int cha, unsigned char val )
+JZEvent* tGS::CC1SX(int index, long clk, int cha, unsigned char val)
 {
-   return Sysex( clk, SX_GS_CC1Pitch + index, cha, 1, &val );
+   return Sysex(clk, SX_GS_CC1Pitch + index, cha, 1, &val);
 }
 
-JZEvent* tGS::CC2SX( int index, long clk, int cha, unsigned char val )
+JZEvent* tGS::CC2SX(int index, long clk, int cha, unsigned char val)
 {
-   return Sysex( clk, SX_GS_CC2Pitch + index, cha, 1, &val );
+   return Sysex(clk, SX_GS_CC2Pitch + index, cha, 1, &val);
 }
 
-JZEvent* tGS::PartialReserveSX( long clk, int cha, unsigned char *valptr )
+JZEvent* tGS::PartialReserveSX(long clk, int cha, unsigned char *valptr)
 {
-   return Sysex( clk, SX_GS_PartialReserve, 16, valptr );
+   return Sysex(clk, SX_GS_PartialReserve, 16, valptr);
 }
 
-JZEvent* tGS::RxChannelSX( long clk, int cha, unsigned char val )
+JZEvent* tGS::RxChannelSX(long clk, int cha, unsigned char val)
 {
-   return Sysex( clk, SX_GS_RxChannel, cha, 1, &val );
+   return Sysex(clk, SX_GS_RxChannel, cha, 1, &val);
 }
 
-JZEvent* tGS::UseForRhythmSX( long clk, int cha, unsigned char val )
+JZEvent* tGS::UseForRhythmSX(long clk, int cha, unsigned char val)
 {
-   return Sysex( clk, SX_GS_UseForRhythm, cha, 1, &val );
+   return Sysex(clk, SX_GS_UseForRhythm, cha, 1, &val);
 }
 
-JZEvent* tGS::ControllerNumberSX( int ctrlno, long clk, int cha, unsigned char val )
+JZEvent* tGS::ControllerNumberSX(int ctrlno, long clk, int cha, unsigned char val)
 {
-   if (ctrlno == 1)
-      return Sysex( clk, SX_GS_CC1CtrlNo, cha, 1, &val );
-   else if (ctrlno == 2)
-      return Sysex( clk, SX_GS_CC2CtrlNo, cha, 1, &val );
-   else
-      return 0;
+  if (ctrlno == 1)
+    return Sysex(clk, SX_GS_CC1CtrlNo, cha, 1, &val);
+  else if (ctrlno == 2)
+    return Sysex(clk, SX_GS_CC2CtrlNo, cha, 1, &val);
+  else
+    return 0;
 }
 
-JZEvent* tGS::ReverbMacroSX( long clk, unsigned char val, unsigned char lsb )
+JZEvent* tGS::ReverbMacroSX(long clk, unsigned char val, unsigned char lsb)
 {
-   return Sysex( clk, SX_GS_ReverbMacro, val );
+   return Sysex(clk, SX_GS_ReverbMacro, val);
 }
 
-JZEvent* tGS::ReverbParamSX( int index, long clk, unsigned char val )
+JZEvent* tGS::ReverbParamSX(int index, long clk, unsigned char val)
 {
-   return Sysex( clk, SX_GS_RevCharacter + index, val );
+   return Sysex(clk, SX_GS_RevCharacter + index, val);
 }
 
-JZEvent* tGS::ChorusMacroSX( long clk, unsigned char val, unsigned char lsb )
+JZEvent* tGS::ChorusMacroSX(long clk, unsigned char val, unsigned char lsb)
 {
-   return Sysex( clk, SX_GS_ChorusMacro, val );
+   return Sysex(clk, SX_GS_ChorusMacro, val);
 }
 
-JZEvent* tGS::ChorusParamSX( int index, long clk, unsigned char val )
+JZEvent* tGS::ChorusParamSX(int index, long clk, unsigned char val)
 {
-   return Sysex( clk, SX_GS_ChoPreLpf + index, val );
+   return Sysex(clk, SX_GS_ChoPreLpf + index, val);
 }
 
 
 
 // XG:
 
-JZEvent* tXG::ModSX( int index, long clk, int cha, unsigned char val )
+JZEvent* tXG::ModSX(int index, long clk, int cha, unsigned char val)
 {
    if ((index >= 0) && (index <= 2))
-      return Sysex( clk, SX_XG_ModPitch + index, cha, 1, &val );
+      return Sysex(clk, SX_XG_ModPitch + index, cha, 1, &val);
    else if ((index >= 4) && (index <=6))
-      return Sysex( clk, SX_XG_ModPitch + index - 1, cha, 1, &val );
+      return Sysex(clk, SX_XG_ModPitch + index - 1, cha, 1, &val);
    else
       return 0;
 }
 
-JZEvent* tXG::BendSX( int index, long clk, int cha, unsigned char val )
+JZEvent* tXG::BendSX(int index, long clk, int cha, unsigned char val)
 {
    if ((index >= 0) && (index <= 2))
-      return Sysex( clk, SX_XG_BendPitch + index, cha, 1, &val );
+      return Sysex(clk, SX_XG_BendPitch + index, cha, 1, &val);
    else if ((index >= 4) && (index <=6))
-       return Sysex( clk, SX_XG_BendPitch + index - 1, cha, 1, &val );
+       return Sysex(clk, SX_XG_BendPitch + index - 1, cha, 1, &val);
    else
       return 0;
 }
 
-JZEvent* tXG::CafSX( int index, long clk, int cha, unsigned char val )
+JZEvent* tXG::CafSX(int index, long clk, int cha, unsigned char val)
 {
    if ((index >= 0) && (index <= 2))
-      return Sysex( clk, SX_XG_CafPitch + index, cha, 1, &val );
+      return Sysex(clk, SX_XG_CafPitch + index, cha, 1, &val);
    else if ((index >= 4) && (index <= 6))
-       return Sysex( clk, SX_XG_CafPitch + index - 1, cha, 1, &val );
+       return Sysex(clk, SX_XG_CafPitch + index - 1, cha, 1, &val);
    else
       return 0;
 }
 
-JZEvent* tXG::PafSX( int index, long clk, int cha, unsigned char val )
+JZEvent* tXG::PafSX(int index, long clk, int cha, unsigned char val)
 {
    if ((index >= 0) && (index <= 2))
-      return Sysex( clk, SX_XG_PafPitch + index, cha, 1, &val );
+      return Sysex(clk, SX_XG_PafPitch + index, cha, 1, &val);
    else if ((index >= 4) && (index <= 6))
-       return Sysex( clk, SX_XG_PafPitch + index - 1, cha, 1, &val );
+       return Sysex(clk, SX_XG_PafPitch + index - 1, cha, 1, &val);
    else
       return 0;
 }
 
-JZEvent* tXG::CC1SX( int index, long clk, int cha, unsigned char val )
+JZEvent* tXG::CC1SX(int index, long clk, int cha, unsigned char val)
 {
    if ((index >= 0) && (index <= 2))
-      return Sysex( clk, SX_XG_CC1Pitch + index, cha, 1, &val );
+      return Sysex(clk, SX_XG_CC1Pitch + index, cha, 1, &val);
    else if ((index >= 4) && (index <= 6))
-       return Sysex( clk, SX_XG_CC1Pitch + index - 1, cha, 1, &val );
+       return Sysex(clk, SX_XG_CC1Pitch + index - 1, cha, 1, &val);
    else
       return 0;
 }
 
-JZEvent* tXG::CC2SX( int index, long clk, int cha, unsigned char val )
+JZEvent* tXG::CC2SX(int index, long clk, int cha, unsigned char val)
 {
    if ((index >= 0) && (index <= 2))
-      return Sysex( clk, SX_XG_CC2Pitch + index, cha, 1, &val );
+      return Sysex(clk, SX_XG_CC2Pitch + index, cha, 1, &val);
    else if ((index >= 4) && (index <= 6))
-       return Sysex( clk, SX_XG_CC2Pitch + index - 1, cha, 1, &val );
+       return Sysex(clk, SX_XG_CC2Pitch + index - 1, cha, 1, &val);
    else
       return 0;
 }
 
-JZEvent* tXG::RxChannelSX( long clk, int cha, unsigned char val )
+JZEvent* tXG::RxChannelSX(long clk, int cha, unsigned char val)
 {
-   return Sysex( clk, SX_XG_RxChannel, cha, 1, &val );
+   return Sysex(clk, SX_XG_RxChannel, cha, 1, &val);
 }
 
-JZEvent* tXG::UseForRhythmSX( long clk, int cha, unsigned char val )
+JZEvent* tXG::UseForRhythmSX(long clk, int cha, unsigned char val)
 {
-   return Sysex( clk, SX_XG_UseForRhythm, cha, 1, &val );
+   return Sysex(clk, SX_XG_UseForRhythm, cha, 1, &val);
 }
 
-JZEvent* tXG::ControllerNumberSX( int ctrlno, long clk, int cha, unsigned char val )
+JZEvent* tXG::ControllerNumberSX(int ctrlno, long clk, int cha, unsigned char val)
 {
    if (ctrlno == 1)
-      return Sysex( clk, SX_XG_CC1CtrlNo, cha, 1, &val );
+      return Sysex(clk, SX_XG_CC1CtrlNo, cha, 1, &val);
    else if (ctrlno == 2)
-      return Sysex( clk, SX_XG_CC2CtrlNo, cha, 1, &val );
+      return Sysex(clk, SX_XG_CC2CtrlNo, cha, 1, &val);
    else
       return 0;
 }
 
-JZEvent* tXG::ReverbMacroSX( long clk, unsigned char val, unsigned char lsb )
+JZEvent* tXG::ReverbMacroSX(long clk, unsigned char val, unsigned char lsb)
 {
    unsigned char valp[2];
    valp[0] = val;
    valp[1] = lsb;
 
-   return Sysex( clk, SX_XG_ReverbMacro, 2, valp );
+   return Sysex(clk, SX_XG_ReverbMacro, 2, valp);
 }
 
-JZEvent* tXG::ChorusMacroSX( long clk, unsigned char val, unsigned char lsb )
+JZEvent* tXG::ChorusMacroSX(long clk, unsigned char val, unsigned char lsb)
 {
-   unsigned char valp[2];
-   valp[0] = val;
-   valp[1] = lsb;
+  unsigned char valp[2];
+  valp[0] = val;
+  valp[1] = lsb;
 
-   return Sysex( clk, SX_XG_ChorusMacro, 2, valp );
+  return Sysex(clk, SX_XG_ChorusMacro, 2, valp);
 }
 
-JZEvent* tXG::EqualizerMacroSX( long clk, unsigned char val )
+JZEvent* tXG::EqualizerMacroSX(long clk, unsigned char val)
 {
-   return Sysex( clk, SX_XG_EqualizerMacro, val );
+  return Sysex(clk, SX_XG_EqualizerMacro, val);
 }

Modified: trunk/jazz/src/Track.cpp
===================================================================
--- trunk/jazz/src/Track.cpp	2008-04-21 13:49:25 UTC (rev 473)
+++ trunk/jazz/src/Track.cpp	2008-04-22 04:38:39 UTC (rev 474)
@@ -92,7 +92,7 @@
 
 tMtcTime::tMtcTime(tMtcOffset *s)
 {
-  type = (tMtcType) ((s->Data[0] & 0x60) >> 5);
+  type = (tMtcType) ((s->mpData[0] & 0x60) >> 5);
   if (type < Mtc24)
   {
     type = Mtc24;
@@ -101,10 +101,10 @@
   {
     type = Mtc30Ndf;
   }
-  hour = s->Data[0] & 0x1f;
-  min = s->Data[1];
-  sec = s->Data[2];
-  fm = s->Data[3];
+  hour = s->mpData[0] & 0x1f;
+  min = s->mpData[1];
+  sec = s->mpData[2];
+  fm = s->mpData[3];
 }
 
 tMtcTime::tMtcTime(int millisec, tMtcType t)
@@ -2085,7 +2085,7 @@
 {
   if (Copyright)
   {
-    return (const char *)Copyright->Data;
+    return (const char *)Copyright->mpData;
   }
   return "";
 }
@@ -2116,22 +2116,22 @@
 {
   if (mName)
   {
-    return (const char*)mName->Data;
+    return (const char*)mName->mpData;
   }
   return "";
 }
 
 
 
-void JZTrack::SetName(char *str)
+void JZTrack::SetName(const char* pTrackName)
 {
   if (mName)
   {
     Kill(mName);
   }
-  if (strlen(str))
+  if (strlen(pTrackName))
   {
-    Put(new tTrackName(0, (unsigned char *)str, strlen(str)));
+    Put(new tTrackName(0, (unsigned char *)pTrackName, strlen(pTrackName)));
   }
   Cleanup();
 }

Modified: trunk/jazz/src/Track.h
===================================================================
--- trunk/jazz/src/Track.h	2008-04-21 13:49:25 UTC (rev 473)
+++ trunk/jazz/src/Track.h	2008-04-22 04:38:39 UTC (rev 474)
@@ -452,7 +452,7 @@
     void Cleanup();
 
     const char* GetName();
-    void SetName(char *Name);
+    void SetName(const char *Name);
 
     const char* GetCopyright();
     void SetCopyright(char *Copyright);

Modified: trunk/jazz/src/TrackWindow.cpp
===================================================================
--- trunk/jazz/src/TrackWindow.cpp	2008-04-21 13:49:25 UTC (rev 473)
+++ trunk/jazz/src/TrackWindow.cpp	2008-04-22 04:38:39 UTC (rev 474)
@@ -352,6 +352,7 @@
     if (pTrack)
     {
       pTrack->Dialog(this);
+      Refresh(false);
     }
   }
   else if (

Modified: trunk/jazz/src/mswin/WindowsPlayer.cpp
===================================================================
--- trunk/jazz/src/mswin/WindowsPlayer.cpp	2008-04-21 13:49:25 UTC (rev 473)
+++ trunk/jazz/src/mswin/WindowsPlayer.cpp	2008-04-22 04:38:39 UTC (rev 474)
@@ -426,7 +426,7 @@
 
   state->sysex_found = TRUE;
   tWinSysexBuffer *buf = state->osx_buffers->AllocBuffer();
-  buf->PrepareOut(state->hout, sx->Data, sx->Length - 1);
+  buf->PrepareOut(state->hout, sx->mpData, sx->Length - 1);
   state->play_buffer.put(SYSEX_EVENT, time);
   state->play_buffer.put((DWORD)buf, time);
   return 0;
@@ -487,7 +487,7 @@
     if (s->Length + 1 < maxSysLen)
     {
       pSysBuf[0] = 0xf0;
-      memcpy(pSysBuf + 1, s->Data, s->Length);
+      memcpy(pSysBuf + 1, s->mpData, s->Length);
 
       pSysHdr->lpData = (LPSTR)pSysBuf;
       pSysHdr->dwBufferLength = s->Length + 1;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.