jazzplusplus-updates — SVN commit message list

SF.net SVN: jazzplusplus:[868] trunk/jazz/src/DeprecatedWx/proplist.h

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

Revision: 868
          http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=868&view=rev
Author:   pstieber
Date:     2011-08-05 00:07:36 +0000 (Fri, 05 Aug 2011)

Log Message:
-----------
Changed DECLARE_CLASS to DECLARE_DYNAMIC_CLASS.

Modified Paths:
--------------
    trunk/jazz/src/DeprecatedWx/proplist.h

Modified: trunk/jazz/src/DeprecatedWx/proplist.h
===================================================================
--- trunk/jazz/src/DeprecatedWx/proplist.h	2011-08-05 00:02:50 UTC (rev 867)
+++ trunk/jazz/src/DeprecatedWx/proplist.h	2011-08-05 00:07:36 UTC (rev 868)
@@ -253,7 +253,7 @@
     wxPropertyListView* m_view;
 
 private:
-    DECLARE_CLASS(wxPropertyTextEdit)
+    DECLARE_DYNAMIC_CLASS(wxPropertyTextEdit)
 };
 
 #define wxPROP_ALLOW_TEXT_EDITING           1
@@ -351,7 +351,7 @@
     wxPropertyListView*   m_view;
 
 private:
-    DECLARE_CLASS(wxPropertyListDialog)
+    DECLARE_DYNAMIC_CLASS(wxPropertyListDialog)
     DECLARE_EVENT_TABLE()
 };
 
@@ -395,7 +395,7 @@
 
 private:
     DECLARE_EVENT_TABLE()
-    DECLARE_CLASS(wxPropertyListPanel)
+    DECLARE_DYNAMIC_CLASS(wxPropertyListPanel)
 };
 
 /*
@@ -437,7 +437,7 @@
 
 private:
     DECLARE_EVENT_TABLE()
-    DECLARE_CLASS(wxPropertyListFrame)
+    DECLARE_DYNAMIC_CLASS(wxPropertyListFrame)
 };
 
 /*


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

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

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

Revision: 867
          http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=867&view=rev
Author:   pstieber
Date:     2011-08-05 00:02:50 +0000 (Fri, 05 Aug 2011)

Log Message:
-----------
Upgraded from wxStringList to wxArrayString.

Modified Paths:
--------------
    trunk/jazz/src/DeprecatedWx/propform.cpp
    trunk/jazz/src/DeprecatedWx/propform.h

Modified: trunk/jazz/src/DeprecatedWx/propform.cpp
===================================================================
--- trunk/jazz/src/DeprecatedWx/propform.cpp	2011-08-04 23:54:54 UTC (rev 866)
+++ trunk/jazz/src/DeprecatedWx/propform.cpp	2011-08-05 00:02:50 UTC (rev 867)
@@ -673,7 +673,7 @@
 ///
 IMPLEMENT_DYNAMIC_CLASS(wxStringFormValidator, wxPropertyFormValidator)
 
-wxStringFormValidator::wxStringFormValidator(wxStringList *list, long flags):
+wxStringFormValidator::wxStringFormValidator(wxArrayString *list, long flags):
 wxPropertyFormValidator(flags)
 {
     m_strings = list;
@@ -692,7 +692,7 @@
     if (m_propertyWindow->IsKindOf(CLASSINFO(wxTextCtrl)))
     {
         wxTextCtrl *text = (wxTextCtrl *)m_propertyWindow;
-        if (!m_strings->Member(text->GetValue()))
+        if (m_strings->Index(text->GetValue()) == wxNOT_FOUND)
         {
             wxString str( wxT("Value ") );
             str += text->GetValue();
@@ -765,12 +765,13 @@
         if (lbox->GetCount() == 0 && m_strings)
         {
             // Try to initialize the listbox from 'strings'
-            wxStringList::compatibility_iterator node = m_strings->GetFirst();
-            while (node)
+            for (
+              wxArrayString::iterator iString = m_strings->begin();
+              iString != m_strings->end();
+              ++iString)
             {
-                const wxChar* s = node->GetData();
+                const wxString& s = *iString;
                 lbox->Append(s);
-                node = node->GetNext();
             }
         }
         lbox->SetStringSelection(property->GetValue().StringValue());
@@ -789,12 +790,13 @@
         {
             // Try to initialize the choice item from 'strings'
             // XView doesn't allow this kind of thing.
-            wxStringList::compatibility_iterator node = m_strings->GetFirst();
-            while (node)
+            for (
+              wxArrayString::iterator iString = m_strings->begin();
+              iString != m_strings->end();
+              ++iString)
             {
-                const wxChar* s = node->GetData();
+                const wxString& s = *iString;
                 choice->Append(s);
-                node = node->GetNext();
             }
         }
         choice->SetStringSelection(property->GetValue().StringValue());

Modified: trunk/jazz/src/DeprecatedWx/propform.h
===================================================================
--- trunk/jazz/src/DeprecatedWx/propform.h	2011-08-04 23:54:54 UTC (rev 866)
+++ trunk/jazz/src/DeprecatedWx/propform.h	2011-08-05 00:02:50 UTC (rev 867)
@@ -253,7 +253,7 @@
 {
   DECLARE_DYNAMIC_CLASS(wxStringFormValidator)
  public:
-   wxStringFormValidator(wxStringList *list = NULL, long flags = 0);
+   wxStringFormValidator(wxArrayString *list = NULL, long flags = 0);
 
    ~wxStringFormValidator(void)
    {
@@ -266,7 +266,7 @@
    bool OnDisplayValue(wxProperty *property, wxPropertyFormView *view, wxWindow *parentWindow);
 
  protected:
-  wxStringList*     m_strings;
+  wxArrayString*     m_strings;
 };
 
 /*


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

SF.net SVN: jazzplusplus:[866] trunk/jazz/src/DeprecatedWx/propform.h

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

Revision: 866
          http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=866&view=rev
Author:   pstieber
Date:     2011-08-04 23:54:54 +0000 (Thu, 04 Aug 2011)

Log Message:
-----------
Changed DECLARE_CLASS to DECLARE_DYNAMIC_CLASS.

Modified Paths:
--------------
    trunk/jazz/src/DeprecatedWx/propform.h

Modified: trunk/jazz/src/DeprecatedWx/propform.h
===================================================================
--- trunk/jazz/src/DeprecatedWx/propform.h	2011-08-04 23:52:23 UTC (rev 865)
+++ trunk/jazz/src/DeprecatedWx/propform.h	2011-08-04 23:54:54 UTC (rev 866)
@@ -295,7 +295,7 @@
     wxPropertyFormView*       m_view;
 
     DECLARE_EVENT_TABLE()
-    DECLARE_CLASS(wxPropertyFormDialog)
+    DECLARE_DYNAMIC_CLASS(wxPropertyFormDialog)
 };
 
 /*
@@ -332,7 +332,7 @@
 private:
     wxPropertyFormView*       m_view;
 
-    DECLARE_CLASS(wxPropertyFormPanel)
+    DECLARE_DYNAMIC_CLASS(wxPropertyFormPanel)
 };
 
 /*
@@ -369,7 +369,7 @@
     wxPanel*                  m_propertyPanel;
 
     DECLARE_EVENT_TABLE()
-    DECLARE_CLASS(wxPropertyFormFrame)
+    DECLARE_DYNAMIC_CLASS(wxPropertyFormFrame)
 };
 
 #endif


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

SF.net SVN: jazzplusplus:[865] trunk/jazz/src/DeprecatedWx/propform.cpp

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

Revision: 865
          http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=865&view=rev
Author:   pstieber
Date:     2011-08-04 23:52:23 +0000 (Thu, 04 Aug 2011)

Log Message:
-----------
Removed unneeded casts.

Modified Paths:
--------------
    trunk/jazz/src/DeprecatedWx/propform.cpp

Modified: trunk/jazz/src/DeprecatedWx/propform.cpp
===================================================================
--- trunk/jazz/src/DeprecatedWx/propform.cpp	2011-08-04 23:41:07 UTC (rev 864)
+++ trunk/jazz/src/DeprecatedWx/propform.cpp	2011-08-04 23:52:23 UTC (rev 865)
@@ -479,10 +479,10 @@
     wxString value(((wxTextCtrl *)m_propertyWindow)->GetValue());
 
     float val = 0.0;
-    if (!StringToFloat(WXSTRINGCAST value, &val))
+    if (!StringToFloat(value, &val))
     {
         wxChar buf[200];
-        wxSprintf(buf, wxT("Value %s is not a valid real number!"), (const wxChar *)value);
+        wxSprintf(buf, wxT("Value %s is not a valid real number!"), value);
         wxMessageBox(buf, wxT("Property value error"), wxOK | wxICON_EXCLAMATION, parentWindow);
         return false;
     }
@@ -510,7 +510,7 @@
     if (value.Length() == 0)
         return false;
 
-    float f = (float)wxAtof((const wxChar *)value);
+    float f = (float)wxAtof(value);
     property->GetValue() = f;
     return true;
 }
@@ -550,10 +550,10 @@
     {
         wxString value(((wxTextCtrl *)m_propertyWindow)->GetValue());
 
-        if (!StringToLong(WXSTRINGCAST value, &val))
+        if (!StringToLong(value, &val))
         {
             wxChar buf[200];
-            wxSprintf(buf, wxT("Value %s is not a valid integer!"), (const wxChar *)value);
+            wxSprintf(buf, wxT("Value %s is not a valid integer!"), value);
             wxMessageBox(buf, wxT("Property value error"), wxOK | wxICON_EXCLAMATION, parentWindow);
             return false;
         }
@@ -590,7 +590,7 @@
         if (value.Length() == 0)
             return false;
 
-        long i = wxAtol((const wxChar *)value);
+        long i = wxAtol(value);
         property->GetValue() = i;
     }
     else if (m_propertyWindow->IsKindOf(CLASSINFO(wxSlider)))


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

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

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

Revision: 864
          http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=864&view=rev
Author:   pstieber
Date:     2011-08-04 23:41:07 +0000 (Thu, 04 Aug 2011)

Log Message:
-----------
Updated some string code.

Modified Paths:
--------------
    trunk/jazz/src/DeprecatedWx/prop.cpp
    trunk/jazz/src/DeprecatedWx/prop.h

Modified: trunk/jazz/src/DeprecatedWx/prop.cpp
===================================================================
--- trunk/jazz/src/DeprecatedWx/prop.cpp	2011-08-04 20:29:50 UTC (rev 863)
+++ trunk/jazz/src/DeprecatedWx/prop.cpp	2011-08-04 23:41:07 UTC (rev 864)
@@ -637,7 +637,7 @@
 // void wxPropertyValue::operator=(const char *val)
 void wxPropertyValue::operator=(const wxString& val1)
 {
-  const wxChar *val = (const wxChar *)val1;
+  const wxChar *val = val1.c_str();
 
   m_modifiedFlag = true;
 
@@ -1226,7 +1226,7 @@
 wxPropertyValidator::~wxPropertyValidator(void)
 {}
 
-bool wxPropertyValidator::StringToFloat (wxChar *s, float *number)
+bool wxPropertyValidator::StringToFloat (const wxString& s, float *number)
 {
     double num;
     bool ok = StringToDouble (s, &num);
@@ -1234,7 +1234,7 @@
     return ok;
 }
 
-bool wxPropertyValidator::StringToDouble (wxChar *s, double *number)
+bool wxPropertyValidator::StringToDouble (const wxString& s, double *number)
 {
     bool ok = true;
     wxChar *value_ptr;
@@ -1251,7 +1251,7 @@
     return ok;
 }
 
-bool wxPropertyValidator::StringToInt (wxChar *s, int *number)
+bool wxPropertyValidator::StringToInt (const wxString& s, int *number)
 {
     long num;
     bool ok = StringToLong (s, &num);
@@ -1259,7 +1259,7 @@
     return ok;
 }
 
-bool wxPropertyValidator::StringToLong (wxChar *s, long *number)
+bool wxPropertyValidator::StringToLong (const wxString& s, long *number)
 {
     bool ok = true;
     wxChar *value_ptr;

Modified: trunk/jazz/src/DeprecatedWx/prop.h
===================================================================
--- trunk/jazz/src/DeprecatedWx/prop.h	2011-08-04 20:29:50 UTC (rev 863)
+++ trunk/jazz/src/DeprecatedWx/prop.h	2011-08-04 23:41:07 UTC (rev 864)
@@ -195,10 +195,10 @@
       return m_validatorProperty;
     }
 
-    virtual bool StringToFloat (wxChar *s, float *number);
-    virtual bool StringToDouble (wxChar *s, double *number);
-    virtual bool StringToInt (wxChar *s, int *number);
-    virtual bool StringToLong (wxChar *s, long *number);
+    virtual bool StringToFloat (const wxString& s, float *number);
+    virtual bool StringToDouble (const wxString& s, double *number);
+    virtual bool StringToInt (const wxString& s, int *number);
+    virtual bool StringToLong (const wxString& s, long *number);
     virtual wxChar *FloatToString (float number);
     virtual wxChar *DoubleToString (double number);
     virtual wxChar *IntToString (int number);


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

SF.net SVN: jazzplusplus:[863] trunk/jazz/src/Dialogs/TextDialog.cpp

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

Revision: 863
          http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=863&view=rev
Author:   pstieber
Date:     2011-08-04 20:29:50 +0000 (Thu, 04 Aug 2011)

Log Message:
-----------
Added .c_str() back to a SetText argument.

Modified Paths:
--------------
    trunk/jazz/src/Dialogs/TextDialog.cpp

Modified: trunk/jazz/src/Dialogs/TextDialog.cpp
===================================================================
--- trunk/jazz/src/Dialogs/TextDialog.cpp	2011-08-04 20:00:23 UTC (rev 862)
+++ trunk/jazz/src/Dialogs/TextDialog.cpp	2011-08-04 20:29:50 UTC (rev 863)
@@ -117,7 +117,7 @@
 bool JZTextDialog::TransferDataFromWindow()
 {
   wxString Text = mpTextEdit->GetValue();
-  mpTextEvent->SetText(Text);
+  mpTextEvent->SetText(Text.c_str());
 
   wxString ClockString = mpClockEdit->GetValue();
   int Clock = gpProject->StringToClock(ClockString);


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

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

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

Revision: 862
          http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=862&view=rev
Author:   pstieber
Date:     2011-08-04 20:00:23 +0000 (Thu, 04 Aug 2011)

Log Message:
-----------
Removed unneeded .c_str() calls.

Modified Paths:
--------------
    trunk/jazz/src/Dialogs/SetTempoDialog.cpp
    trunk/jazz/src/Dialogs/SysexDialog.cpp
    trunk/jazz/src/Dialogs/TextDialog.cpp

Modified: trunk/jazz/src/Dialogs/SetTempoDialog.cpp
===================================================================
--- trunk/jazz/src/Dialogs/SetTempoDialog.cpp	2011-08-04 17:55:07 UTC (rev 861)
+++ trunk/jazz/src/Dialogs/SetTempoDialog.cpp	2011-08-04 20:00:23 UTC (rev 862)
@@ -112,7 +112,7 @@
 
   string ClockString;
   gpProject->ClockToString(mpSetTempoEvent->GetClock(), ClockString);
-  mpClockEdit->ChangeValue(ClockString.c_str());
+  mpClockEdit->ChangeValue(ClockString);
 
   return true;
 }
@@ -127,7 +127,7 @@
     mpSetTempoEvent->SetBPM(BeatsPerMinute);
 
     wxString ClockString = mpClockEdit->GetValue();
-    int Clock = gpProject->StringToClock(ClockString.c_str());
+    int Clock = gpProject->StringToClock(ClockString);
     mpSetTempoEvent->SetClock(Clock);
 
     return true;

Modified: trunk/jazz/src/Dialogs/SysexDialog.cpp
===================================================================
--- trunk/jazz/src/Dialogs/SysexDialog.cpp	2011-08-04 17:55:07 UTC (rev 861)
+++ trunk/jazz/src/Dialogs/SysexDialog.cpp	2011-08-04 20:00:23 UTC (rev 862)
@@ -135,11 +135,11 @@
     }
   }
 
-  mpSysExEdit->ChangeValue(Oss.str().c_str());
+  mpSysExEdit->ChangeValue(Oss.str());
 
   string ClockString;
   gpProject->ClockToString(mpSysExEvent->GetClock(), ClockString);
-  mpClockEdit->ChangeValue(ClockString.c_str());
+  mpClockEdit->ChangeValue(ClockString);
 
   return true;
 }
@@ -195,7 +195,7 @@
 //  mpSysExEvent->SetData(???);
 
   wxString ClockString = mpClockEdit->GetValue();
-  int Clock = gpProject->StringToClock(ClockString.c_str());
+  int Clock = gpProject->StringToClock(ClockString);
   mpSysExEvent->SetClock(Clock);
 
   return true;

Modified: trunk/jazz/src/Dialogs/TextDialog.cpp
===================================================================
--- trunk/jazz/src/Dialogs/TextDialog.cpp	2011-08-04 17:55:07 UTC (rev 861)
+++ trunk/jazz/src/Dialogs/TextDialog.cpp	2011-08-04 20:00:23 UTC (rev 862)
@@ -107,7 +107,7 @@
 
   string ClockString;
   gpProject->ClockToString(mpTextEvent->GetClock(), ClockString);
-  mpClockEdit->ChangeValue(ClockString.c_str());
+  mpClockEdit->ChangeValue(ClockString);
 
   return true;
 }
@@ -117,10 +117,10 @@
 bool JZTextDialog::TransferDataFromWindow()
 {
   wxString Text = mpTextEdit->GetValue();
-  mpTextEvent->SetText(Text.c_str());
+  mpTextEvent->SetText(Text);
 
   wxString ClockString = mpClockEdit->GetValue();
-  int Clock = gpProject->StringToClock(ClockString.c_str());
+  int Clock = gpProject->StringToClock(ClockString);
   mpTextEvent->SetClock(Clock);
 
   return true;


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

SF.net SVN: jazzplusplus:[861] trunk/jazz/src/Dialogs/KeyOnDialog.cpp

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

Revision: 861
          http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=861&view=rev
Author:   pstieber
Date:     2011-08-04 17:55:07 +0000 (Thu, 04 Aug 2011)

Log Message:
-----------
Removed unneeded c_str() calls.

Modified Paths:
--------------
    trunk/jazz/src/Dialogs/KeyOnDialog.cpp

Modified: trunk/jazz/src/Dialogs/KeyOnDialog.cpp
===================================================================
--- trunk/jazz/src/Dialogs/KeyOnDialog.cpp	2011-08-04 17:45:18 UTC (rev 860)
+++ trunk/jazz/src/Dialogs/KeyOnDialog.cpp	2011-08-04 17:55:07 UTC (rev 861)
@@ -185,18 +185,18 @@
 {
   string KeyString;
   KeyToString(mpEvent->GetKey(), KeyString);
-  mpPitchEdit->ChangeValue(KeyString.c_str());
+  mpPitchEdit->ChangeValue(KeyString);
 
   ostringstream Oss;
 
   Oss << (int)mpEvent->GetVelocity();
-  mpVelocityValue->SetLabel(Oss.str().c_str());
+  mpVelocityValue->SetLabel(Oss.str());
 
   mpVelocityKnob->SetValue(mpEvent->GetVelocity());
 
   Oss.str("");
   Oss << (int)mpEvent->GetOffVelocity();
-  mpOffVelocityValue->SetLabel(Oss.str().c_str());
+  mpOffVelocityValue->SetLabel(Oss.str());
 
   mpOffVelocityKnob->SetValue(mpEvent->GetOffVelocity());
 
@@ -206,13 +206,13 @@
 
   Oss.str("");
   Oss << (int)mpEvent->GetChannel() + 1;
-  mpChannelValue->SetLabel(Oss.str().c_str());
+  mpChannelValue->SetLabel(Oss.str());
 
   mpChannelKnob->SetValue(mpEvent->GetChannel() + 1);
 
   string ClockString;
   gpProject->ClockToString(mpEvent->GetClock(), ClockString);
-  mpClockEdit->ChangeValue(ClockString.c_str());
+  mpClockEdit->ChangeValue(ClockString);
 
   return true;
 }
@@ -222,14 +222,14 @@
 bool JZKeyOnDialog::TransferDataFromWindow()
 {
   wxString KeyString = mpPitchEdit->GetValue();
-  mpEvent->SetKey(StringToKey(KeyString.c_str()));
+  mpEvent->SetKey(StringToKey(KeyString));
 
   mpEvent->SetVelocity(mpVelocityKnob->GetValue());
 
   mpEvent->SetOffVelocity(mpOffVelocityKnob->GetValue());
 
   wxString LengthString = mpLengthEdit->GetValue();
-  istringstream Iss(LengthString.c_str());
+  istringstream Iss(LengthString);
   unsigned short Length;
   Iss >> Length;
   mpEvent->SetLength(Length);
@@ -237,7 +237,7 @@
   mpEvent->SetChannel(mpChannelKnob->GetValue() - 1);
 
   wxString ClockString = mpClockEdit->GetValue();
-  int Clock = gpProject->StringToClock(ClockString.c_str());
+  int Clock = gpProject->StringToClock(ClockString);
   mpEvent->SetClock(Clock);
 
   return true;
@@ -250,7 +250,7 @@
   int Value = Event.GetValue();
   ostringstream Oss;
   Oss << Value;
-  mpVelocityValue->SetLabel(Oss.str().c_str());
+  mpVelocityValue->SetLabel(Oss.str());
 }
 
 //-----------------------------------------------------------------------------
@@ -260,7 +260,7 @@
   int Value = Event.GetValue();
   ostringstream Oss;
   Oss << Value;
-  mpOffVelocityValue->SetLabel(Oss.str().c_str());
+  mpOffVelocityValue->SetLabel(Oss.str());
 }
 
 //-----------------------------------------------------------------------------
@@ -270,7 +270,7 @@
   int Value = Event.GetValue();
   ostringstream Oss;
   Oss << Value;
-  mpChannelValue->SetLabel(Oss.str().c_str());
+  mpChannelValue->SetLabel(Oss.str());
 }
 
 //-----------------------------------------------------------------------------


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

SF.net SVN: jazzplusplus:[860] trunk/jazz/src/Dialogs/EndOfTrackDialog.cpp

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

Revision: 860
          http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=860&view=rev
Author:   pstieber
Date:     2011-08-04 17:45:18 +0000 (Thu, 04 Aug 2011)

Log Message:
-----------
Removed unneeded c_str() calls.

Modified Paths:
--------------
    trunk/jazz/src/Dialogs/EndOfTrackDialog.cpp

Modified: trunk/jazz/src/Dialogs/EndOfTrackDialog.cpp
===================================================================
--- trunk/jazz/src/Dialogs/EndOfTrackDialog.cpp	2011-08-04 17:34:13 UTC (rev 859)
+++ trunk/jazz/src/Dialogs/EndOfTrackDialog.cpp	2011-08-04 17:45:18 UTC (rev 860)
@@ -94,7 +94,7 @@
 {
   string ClockString;
   gpProject->ClockToString(mpEndOfTrackEvent->GetClock(), ClockString);
-  mpClockEdit->ChangeValue(ClockString.c_str());
+  mpClockEdit->ChangeValue(ClockString);
 
   return true;
 }
@@ -104,7 +104,7 @@
 bool JZEndOfTrackDialog::TransferDataFromWindow()
 {
   wxString ClockString = mpClockEdit->GetValue();
-  int Clock = gpProject->StringToClock(ClockString.c_str());
+  int Clock = gpProject->StringToClock(ClockString);
   mpEndOfTrackEvent->SetClock(Clock);
 
   return true;


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

SF.net SVN: jazzplusplus:[859] trunk/jazz/portmidi/porttime/porttime-VC10. vcxproj

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

Revision: 859
          http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=859&view=rev
Author:   pstieber
Date:     2011-08-04 17:34:13 +0000 (Thu, 04 Aug 2011)

Log Message:
-----------
1. Fixed the build configuration names.
2. Set the character set to Unicode.

Modified Paths:
--------------
    trunk/jazz/portmidi/porttime/porttime-VC10.vcxproj

Modified: trunk/jazz/portmidi/porttime/porttime-VC10.vcxproj
===================================================================
--- trunk/jazz/portmidi/porttime/porttime-VC10.vcxproj	2011-08-04 17:25:57 UTC (rev 858)
+++ trunk/jazz/portmidi/porttime/porttime-VC10.vcxproj	2011-08-04 17:34:13 UTC (rev 859)
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug VC9|Win32">
-      <Configuration>Debug VC9</Configuration>
+    <ProjectConfiguration Include="Debug VC10|Win32">
+      <Configuration>Debug VC10</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug VC9|x64">
-      <Configuration>Debug VC9</Configuration>
+    <ProjectConfiguration Include="Debug VC10|x64">
+      <Configuration>Debug VC10</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="Release VC9|Win32">
-      <Configuration>Release VC9</Configuration>
+    <ProjectConfiguration Include="Release VC10|Win32">
+      <Configuration>Release VC10</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="Release VC9|x64">
-      <Configuration>Release VC9</Configuration>
+    <ProjectConfiguration Include="Release VC10|x64">
+      <Configuration>Release VC10</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
   </ItemGroup>
@@ -23,22 +23,22 @@
     <ProjectGuid>{338224B8-D575-408D-BACF-95C557B429BE}</ProjectGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug VC9|Win32'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug VC10|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
+    <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release VC9|Win32'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release VC10|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
+    <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug VC9|x64'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug VC10|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release VC9|x64'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release VC10|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
@@ -46,31 +46,31 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug VC9|Win32'" Label="PropertySheets">
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug VC10|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release VC9|Win32'" Label="PropertySheets">
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release VC10|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug VC9|x64'" Label="PropertySheets">
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug VC10|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release VC9|x64'" Label="PropertySheets">
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release VC10|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release VC9|Win32'">BuildDir\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release VC9|Win32'">BuildDir\$(Platform)\$(Configuration)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug VC9|Win32'">BuildDir\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug VC9|Win32'">BuildDir\$(Platform)\$(Configuration)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release VC9|x64'">BuildDir\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release VC9|x64'">BuildDir\$(Platform)\$(Configuration)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug VC9|x64'">BuildDir\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug VC9|x64'">BuildDir\$(Platform)\$(Configuration)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release VC10|Win32'">BuildDir\$(Platform)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release VC10|Win32'">BuildDir\$(Platform)\$(Configuration)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug VC10|Win32'">BuildDir\$(Platform)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug VC10|Win32'">BuildDir\$(Platform)\$(Configuration)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release VC10|x64'">BuildDir\$(Platform)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release VC10|x64'">BuildDir\$(Platform)\$(Configuration)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug VC10|x64'">BuildDir\$(Platform)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug VC10|x64'">BuildDir\$(Platform)\$(Configuration)\</IntDir>
   </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release VC9|Win32'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release VC10|Win32'">
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
@@ -98,7 +98,7 @@
       <OutputFile>.\$(OutDir)porttime.bsc</OutputFile>
     </Bscmake>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug VC9|Win32'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug VC10|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>_LIB;WIN32;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -126,7 +126,7 @@
       <OutputFile>.\$(OutDir)porttime.bsc</OutputFile>
     </Bscmake>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release VC9|x64'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release VC10|x64'">
     <Midl>
       <TargetEnvironment>X64</TargetEnvironment>
     </Midl>
@@ -157,7 +157,7 @@
       <OutputFile>.\$(OutDir)porttime.bsc</OutputFile>
     </Bscmake>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug VC9|x64'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug VC10|x64'">
     <Midl>
       <TargetEnvironment>X64</TargetEnvironment>
     </Midl>


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

SF.net SVN: jazzplusplus:[858] trunk/jazz/portmidi/pm_win/portmidi-VC10. vcxproj

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

Revision: 858
          http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=858&view=rev
Author:   pstieber
Date:     2011-08-04 17:25:57 +0000 (Thu, 04 Aug 2011)

Log Message:
-----------
Fixed the build configuration names.

Modified Paths:
--------------
    trunk/jazz/portmidi/pm_win/portmidi-VC10.vcxproj

Modified: trunk/jazz/portmidi/pm_win/portmidi-VC10.vcxproj
===================================================================
--- trunk/jazz/portmidi/pm_win/portmidi-VC10.vcxproj	2011-08-04 17:24:02 UTC (rev 857)
+++ trunk/jazz/portmidi/pm_win/portmidi-VC10.vcxproj	2011-08-04 17:25:57 UTC (rev 858)
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug VC9|Win32">
-      <Configuration>Debug VC9</Configuration>
+    <ProjectConfiguration Include="Debug VC10|Win32">
+      <Configuration>Debug VC10</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug VC9|x64">
-      <Configuration>Debug VC9</Configuration>
+    <ProjectConfiguration Include="Debug VC10|x64">
+      <Configuration>Debug VC10</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="Release VC9|Win32">
-      <Configuration>Release VC9</Configuration>
+    <ProjectConfiguration Include="Release VC10|Win32">
+      <Configuration>Release VC10</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="Release VC9|x64">
-      <Configuration>Release VC9</Configuration>
+    <ProjectConfiguration Include="Release VC10|x64">
+      <Configuration>Release VC10</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
   </ItemGroup>
@@ -24,22 +24,22 @@
     <RootNamespace>portmidi</RootNamespace>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release VC9|Win32'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release VC10|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
+    <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug VC9|Win32'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug VC10|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
+    <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release VC9|x64'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release VC10|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug VC9|x64'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug VC10|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
@@ -47,31 +47,31 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release VC9|Win32'" Label="PropertySheets">
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release VC10|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug VC9|Win32'" Label="PropertySheets">
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug VC10|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release VC9|x64'" Label="PropertySheets">
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release VC10|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug VC9|x64'" Label="PropertySheets">
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug VC10|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug VC9|Win32'">BuildDir\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug VC9|Win32'">BuildDir\$(Platform)\$(Configuration)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release VC9|Win32'">BuildDir\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release VC9|Win32'">BuildDir\$(Platform)\$(Configuration)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug VC9|x64'">BuildDir\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug VC9|x64'">BuildDir\$(Platform)\$(Configuration)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release VC9|x64'">BuildDir\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release VC9|x64'">BuildDir\$(Platform)\$(Configuration)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug VC10|Win32'">BuildDir\$(Platform)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug VC10|Win32'">BuildDir\$(Platform)\$(Configuration)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release VC10|Win32'">BuildDir\$(Platform)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release VC10|Win32'">BuildDir\$(Platform)\$(Configuration)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug VC10|x64'">BuildDir\$(Platform)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug VC10|x64'">BuildDir\$(Platform)\$(Configuration)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release VC10|x64'">BuildDir\$(Platform)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release VC10|x64'">BuildDir\$(Platform)\$(Configuration)\</IntDir>
   </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug VC9|Win32'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug VC10|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\pm_common;..\porttime;..\pm_win;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -100,7 +100,7 @@
       <OutputFile>.\$(OutDir)portmidi.bsc</OutputFile>
     </Bscmake>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release VC9|Win32'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release VC10|Win32'">
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
@@ -129,7 +129,7 @@
       <OutputFile>.\$(OutDir)portmidi.bsc</OutputFile>
     </Bscmake>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug VC9|x64'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug VC10|x64'">
     <Midl>
       <TargetEnvironment>X64</TargetEnvironment>
     </Midl>
@@ -161,7 +161,7 @@
       <OutputFile>.\$(OutDir)portmidi.bsc</OutputFile>
     </Bscmake>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release VC9|x64'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release VC10|x64'">
     <Midl>
       <TargetEnvironment>X64</TargetEnvironment>
     </Midl>


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

SF.net SVN: jazzplusplus:[857] trunk/jazz/vc10/JazzPlusPlus-VC10.sln

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

Revision: 857
          http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=857&view=rev
Author:   pstieber
Date:     2011-08-04 17:24:02 +0000 (Thu, 04 Aug 2011)

Log Message:
-----------
Removed project dependencies.  These are now in the project files instead of the solution files.

Modified Paths:
--------------
    trunk/jazz/vc10/JazzPlusPlus-VC10.sln

Modified: trunk/jazz/vc10/JazzPlusPlus-VC10.sln
===================================================================
--- trunk/jazz/vc10/JazzPlusPlus-VC10.sln	2011-08-04 17:22:55 UTC (rev 856)
+++ trunk/jazz/vc10/JazzPlusPlus-VC10.sln	2011-08-04 17:24:02 UTC (rev 857)
@@ -1,10 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "A JazzPlusPlus Application", "JazzPlusPlus-VC10.vcxproj", "{8C82269C-4753-428B-B9B1-D21B46C6AD83}"
-	ProjectSection(ProjectDependencies) = postProject
-		{33E3B196-B9F4-4D0A-85E1-31C7BBD4967A} = {33E3B196-B9F4-4D0A-85E1-31C7BBD4967A}
-		{338224B8-D575-408D-BACF-95C557B429BE} = {338224B8-D575-408D-BACF-95C557B429BE}
-	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "portmidi", "..\portmidi\pm_win\portmidi-VC10.vcxproj", "{33E3B196-B9F4-4D0A-85E1-31C7BBD4967A}"
 EndProject


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

SF.net SVN: jazzplusplus:[856] trunk/jazz/vc10/JazzPlusPlus-VC10.vcxproj

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

Revision: 856
          http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=856&view=rev
Author:   pstieber
Date:     2011-08-04 17:22:55 +0000 (Thu, 04 Aug 2011)

Log Message:
-----------
1. Set the character set to Unicode.
2. Set the target name to JazzPlusPlus instead of the project name.
3. Updated the libraries to wx 2.9.
4. Added missing source modules.
5. Fixed portmidi dependency.
6. Added porttime dependency.

Modified Paths:
--------------
    trunk/jazz/vc10/JazzPlusPlus-VC10.vcxproj

Modified: trunk/jazz/vc10/JazzPlusPlus-VC10.vcxproj
===================================================================
--- trunk/jazz/vc10/JazzPlusPlus-VC10.vcxproj	2011-08-01 20:55:49 UTC (rev 855)
+++ trunk/jazz/vc10/JazzPlusPlus-VC10.vcxproj	2011-08-04 17:22:55 UTC (rev 856)
@@ -27,10 +27,12 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release GUI VC10|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug GUI VC10|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release GUI VC10|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
@@ -70,6 +72,8 @@
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release GUI VC10|x64'">BuildDir\$(Platform)\$(Configuration)\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release GUI VC10|x64'">BuildDir\$(Platform)\$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release GUI VC10|x64'">false</LinkIncremental>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release GUI VC10|Win32'">JazzPlusPlus</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug GUI VC10|Win32'">JazzPlusPlus</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug GUI VC10|Win32'">
     <Midl>
@@ -107,7 +111,7 @@
       <AdditionalIncludeDirectories>$(EXT_PKGS)\wxMSW-2.9.2-VC10\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>wxmsw28d_xrc.lib;wxbase28d_xml.lib;wxexpatd.lib;wxmsw28d_core.lib;wxmsw28d_adv.lib;wxmsw28d_html.lib;wxbase28d.lib;wxpngd.lib;wxzlibd.lib;wxjpegd.lib;wxtiffd.lib;odbc32.lib;odbccp32.lib;comctl32.lib;rpcrt4.lib;wsock32.lib;winmm.lib;opengl32.lib;glu32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>wxmsw29ud_xrc.lib;wxbase29ud_xml.lib;wxexpatd.lib;wxmsw29ud_core.lib;wxmsw29ud_adv.lib;wxmsw29ud_html.lib;wxbase29ud.lib;wxpngd.lib;wxzlibd.lib;wxjpegd.lib;wxtiffd.lib;odbc32.lib;odbccp32.lib;comctl32.lib;rpcrt4.lib;wsock32.lib;winmm.lib;opengl32.lib;glu32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>.\$(OutDir)JazzPlusPlus.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>$(EXT_PKGS)\wxMSW-2.9.2-VC10\lib\vc_lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -209,7 +213,7 @@
       <AdditionalIncludeDirectories>$(EXT_PKGS)\wxMSW-2.9.2-VC10\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>wxmsw28_xrc.lib;wxbase28_xml.lib;wxexpat.lib;wxmsw28_core.lib;wxmsw28_adv.lib;wxmsw28_html.lib;wxbase28.lib;wxpng.lib;wxzlib.lib;wxjpeg.lib;wxtiff.lib;odbc32.lib;odbccp32.lib;comctl32.lib;rpcrt4.lib;wsock32.lib;winmm.lib;opengl32.lib;glu32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>wxmsw29u_xrc.lib;wxbase29u_xml.lib;wxexpat.lib;wxmsw29u_core.lib;wxmsw29u_adv.lib;wxmsw29u_html.lib;wxbase29u.lib;wxpng.lib;wxzlib.lib;wxjpeg.lib;wxtiff.lib;odbc32.lib;odbccp32.lib;comctl32.lib;rpcrt4.lib;wsock32.lib;winmm.lib;opengl32.lib;glu32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>.\$(OutDir)JazzPlusPlus.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>$(EXT_PKGS)\wxMSW-2.9.2-VC10\lib\vc_lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -288,6 +292,8 @@
     <ClCompile Include="..\src\Configuration.cpp" />
     <ClCompile Include="..\src\ControlEdit.cpp" />
     <ClCompile Include="..\src\Dialogs.cpp" />
+    <ClCompile Include="..\src\Dialogs\AudioSettingsDialog.cpp" />
+    <ClCompile Include="..\src\Dialogs\SamplesDialog.cpp" />
     <ClCompile Include="..\src\DynamicArray.cpp" />
     <ClCompile Include="..\src\ErrorMessage.cpp" />
     <ClCompile Include="..\src\EventFrame.cpp" />
@@ -335,6 +341,7 @@
     <ClCompile Include="..\src\Sample.cpp" />
     <ClCompile Include="..\src\SampleCommand.cpp" />
     <ClCompile Include="..\src\SampleDialog.cpp" />
+    <ClCompile Include="..\src\SampleFrame.cpp" />
     <ClCompile Include="..\src\SampleWindow.cpp" />
     <ClCompile Include="..\src\SelectControllerDialog.cpp" />
     <ClCompile Include="..\src\Signal2.cpp" />
@@ -391,6 +398,8 @@
     <ClInclude Include="..\src\Configuration.h" />
     <ClInclude Include="..\src\ControlEdit.h" />
     <ClInclude Include="..\src\Dialogs.h" />
+    <ClInclude Include="..\src\Dialogs\AudioSettingsDialog.h" />
+    <ClInclude Include="..\src\Dialogs\SamplesDialog.h" />
     <ClInclude Include="..\src\DynamicArray.h" />
     <ClInclude Include="..\src\ErrorMessage.h" />
     <ClInclude Include="..\src\EventFrame.h" />
@@ -439,6 +448,7 @@
     <ClInclude Include="..\src\Sample.h" />
     <ClInclude Include="..\src\SampleCommand.h" />
     <ClInclude Include="..\src\SampleDialog.h" />
+    <ClInclude Include="..\src\SampleFrame.h" />
     <ClInclude Include="..\src\SampleWindow.h" />
     <ClInclude Include="..\src\SelectControllerDialog.h" />
     <ClInclude Include="..\src\DeprecatedWx\setup.h" />
@@ -515,10 +525,14 @@
     <None Include="..\src\Makefile.am" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="JazzPlusPlus-VC10.vcxproj">
-      <Project>{8c82269c-4753-428b-b9b1-d21b46c6ad83}</Project>
+    <ProjectReference Include="..\portmidi\pm_win\portmidi-VC10.vcxproj">
+      <Project>{33e3b196-b9f4-4d0a-85e1-31c7bbd4967a}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
+    <ProjectReference Include="..\portmidi\porttime\porttime-VC10.vcxproj">
+      <Project>{338224b8-d575-408d-bacf-95c557b429be}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">


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

SF.net SVN: jazzplusplus:[855] trunk/jazz/src/JazzPlusPlusApplication.cpp

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

Revision: 855
          http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=855&view=rev
Author:   pstieber
Date:     2011-08-01 20:55:49 +0000 (Mon, 01 Aug 2011)

Log Message:
-----------
Fixed the code name.

Modified Paths:
--------------
    trunk/jazz/src/JazzPlusPlusApplication.cpp

Modified: trunk/jazz/src/JazzPlusPlusApplication.cpp
===================================================================
--- trunk/jazz/src/JazzPlusPlusApplication.cpp	2011-07-31 01:23:52 UTC (rev 854)
+++ trunk/jazz/src/JazzPlusPlusApplication.cpp	2011-08-01 20:55:49 UTC (rev 855)
@@ -210,7 +210,7 @@
       Is.open(HelpFileNameAndPath.c_str());
       if (!Is)
       {
-        wxString Message = "Failed to add the IPVT book " + mHelpFileName;
+        wxString Message = "Failed to add the Jazz++ book " + mHelpFileName;
         ::wxMessageBox(Message);
       }
       else
@@ -233,7 +233,7 @@
 
   if (HelpFileFound)
   {
-    // Add the IPVT help file the the help system.
+    // Add the Jazz++ help file the the help system.
     mHelp.AddBook(HelpFileNameAndPath);
 
     if (!WasHelpPathRead && pConfig)


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

SF.net SVN: jazzplusplus:[854] trunk/jazz

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

Revision: 854
          http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=854&view=rev
Author:   pstieber
Date:     2011-07-31 01:23:52 +0000 (Sun, 31 Jul 2011)

Log Message:
-----------
Added Visual Studio .NET 2010 solution and project files.

Added Paths:
-----------
    trunk/jazz/vc10/
    trunk/jazz/vc10/JazzPlusPlus-VC10.sln
    trunk/jazz/vc10/JazzPlusPlus-VC10.vcxproj


Property changes on: trunk/jazz/vc10
___________________________________________________________________
Added: bugtraq:number
   + true

Added: trunk/jazz/vc10/JazzPlusPlus-VC10.sln
===================================================================
--- trunk/jazz/vc10/JazzPlusPlus-VC10.sln	                        (rev 0)
+++ trunk/jazz/vc10/JazzPlusPlus-VC10.sln	2011-07-31 01:23:52 UTC (rev 854)
@@ -0,0 +1,49 @@
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "A JazzPlusPlus Application", "JazzPlusPlus-VC10.vcxproj", "{8C82269C-4753-428B-B9B1-D21B46C6AD83}"
+	ProjectSection(ProjectDependencies) = postProject
+		{33E3B196-B9F4-4D0A-85E1-31C7BBD4967A} = {33E3B196-B9F4-4D0A-85E1-31C7BBD4967A}
+		{338224B8-D575-408D-BACF-95C557B429BE} = {338224B8-D575-408D-BACF-95C557B429BE}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "portmidi", "..\portmidi\pm_win\portmidi-VC10.vcxproj", "{33E3B196-B9F4-4D0A-85E1-31C7BBD4967A}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "porttime", "..\portmidi\porttime\porttime-VC10.vcxproj", "{338224B8-D575-408D-BACF-95C557B429BE}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug GUI VC10|Win32 = Debug GUI VC10|Win32
+		Debug GUI VC10|x64 = Debug GUI VC10|x64
+		Release GUI VC10|Win32 = Release GUI VC10|Win32
+		Release GUI VC10|x64 = Release GUI VC10|x64
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{8C82269C-4753-428B-B9B1-D21B46C6AD83}.Debug GUI VC10|Win32.ActiveCfg = Debug GUI VC10|Win32
+		{8C82269C-4753-428B-B9B1-D21B46C6AD83}.Debug GUI VC10|Win32.Build.0 = Debug GUI VC10|Win32
+		{8C82269C-4753-428B-B9B1-D21B46C6AD83}.Debug GUI VC10|x64.ActiveCfg = Debug GUI VC10|x64
+		{8C82269C-4753-428B-B9B1-D21B46C6AD83}.Debug GUI VC10|x64.Build.0 = Debug GUI VC10|x64
+		{8C82269C-4753-428B-B9B1-D21B46C6AD83}.Release GUI VC10|Win32.ActiveCfg = Release GUI VC10|Win32
+		{8C82269C-4753-428B-B9B1-D21B46C6AD83}.Release GUI VC10|Win32.Build.0 = Release GUI VC10|Win32
+		{8C82269C-4753-428B-B9B1-D21B46C6AD83}.Release GUI VC10|x64.ActiveCfg = Release GUI VC10|x64
+		{8C82269C-4753-428B-B9B1-D21B46C6AD83}.Release GUI VC10|x64.Build.0 = Release GUI VC10|x64
+		{33E3B196-B9F4-4D0A-85E1-31C7BBD4967A}.Debug GUI VC10|Win32.ActiveCfg = Debug VC10|Win32
+		{33E3B196-B9F4-4D0A-85E1-31C7BBD4967A}.Debug GUI VC10|Win32.Build.0 = Debug VC10|Win32
+		{33E3B196-B9F4-4D0A-85E1-31C7BBD4967A}.Debug GUI VC10|x64.ActiveCfg = Debug VC10|x64
+		{33E3B196-B9F4-4D0A-85E1-31C7BBD4967A}.Debug GUI VC10|x64.Build.0 = Debug VC10|x64
+		{33E3B196-B9F4-4D0A-85E1-31C7BBD4967A}.Release GUI VC10|Win32.ActiveCfg = Release VC10|Win32
+		{33E3B196-B9F4-4D0A-85E1-31C7BBD4967A}.Release GUI VC10|Win32.Build.0 = Release VC10|Win32
+		{33E3B196-B9F4-4D0A-85E1-31C7BBD4967A}.Release GUI VC10|x64.ActiveCfg = Release VC10|x64
+		{33E3B196-B9F4-4D0A-85E1-31C7BBD4967A}.Release GUI VC10|x64.Build.0 = Release VC10|x64
+		{338224B8-D575-408D-BACF-95C557B429BE}.Debug GUI VC10|Win32.ActiveCfg = Debug VC10|Win32
+		{338224B8-D575-408D-BACF-95C557B429BE}.Debug GUI VC10|Win32.Build.0 = Debug VC10|Win32
+		{338224B8-D575-408D-BACF-95C557B429BE}.Debug GUI VC10|x64.ActiveCfg = Debug VC10|x64
+		{338224B8-D575-408D-BACF-95C557B429BE}.Debug GUI VC10|x64.Build.0 = Debug VC10|x64
+		{338224B8-D575-408D-BACF-95C557B429BE}.Release GUI VC10|Win32.ActiveCfg = Release VC10|Win32
+		{338224B8-D575-408D-BACF-95C557B429BE}.Release GUI VC10|Win32.Build.0 = Release VC10|Win32
+		{338224B8-D575-408D-BACF-95C557B429BE}.Release GUI VC10|x64.ActiveCfg = Release VC10|x64
+		{338224B8-D575-408D-BACF-95C557B429BE}.Release GUI VC10|x64.Build.0 = Release VC10|x64
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal


Property changes on: trunk/jazz/vc10/JazzPlusPlus-VC10.sln
___________________________________________________________________
Added: svn:eol-style
   + native

Added: trunk/jazz/vc10/JazzPlusPlus-VC10.vcxproj
===================================================================
--- trunk/jazz/vc10/JazzPlusPlus-VC10.vcxproj	                        (rev 0)
+++ trunk/jazz/vc10/JazzPlusPlus-VC10.vcxproj	2011-07-31 01:23:52 UTC (rev 854)
@@ -0,0 +1,526 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug GUI VC10|Win32">
+      <Configuration>Debug GUI VC10</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug GUI VC10|x64">
+      <Configuration>Debug GUI VC10</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release GUI VC10|Win32">
+      <Configuration>Release GUI VC10</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release GUI VC10|x64">
+      <Configuration>Release GUI VC10</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectName>A JazzPlusPlus Application</ProjectName>
+    <ProjectGuid>{8C82269C-4753-428B-B9B1-D21B46C6AD83}</ProjectGuid>
+    <RootNamespace>A JazzPlusPlus Application</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release GUI VC10|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug GUI VC10|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release GUI VC10|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug GUI VC10|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release GUI VC10|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug GUI VC10|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release GUI VC10|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug GUI VC10|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug GUI VC10|Win32'">BuildDir\$(Platform)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug GUI VC10|Win32'">BuildDir\$(Platform)\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug GUI VC10|Win32'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug GUI VC10|x64'">BuildDir\$(Platform)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug GUI VC10|x64'">BuildDir\$(Platform)\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug GUI VC10|x64'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release GUI VC10|Win32'">BuildDir\$(Platform)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release GUI VC10|Win32'">BuildDir\$(Platform)\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release GUI VC10|Win32'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release GUI VC10|x64'">BuildDir\$(Platform)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release GUI VC10|x64'">BuildDir\$(Platform)\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release GUI VC10|x64'">false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug GUI VC10|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>.\$(OutDir)JazzPlusPlus.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>$(EXT_PKGS)\wxMSW-2.9.2-VC10\lib\vc_lib\mswud;$(EXT_PKGS)\wxMSW-2.9.2-VC10\include;..\src;..\src\mswin;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;WINVER=0x0400;STRICT;NOMINMAX;__WXDEBUG__;WXDEBUG=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <PrecompiledHeaderOutputFile>.\$(OutDir)JazzPlusPlus.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\$(OutDir)</AssemblerListingLocation>
+      <ObjectFileName>.\$(OutDir)</ObjectFileName>
+      <ProgramDataBaseFileName>.\$(OutDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <DisableSpecificWarnings>4351;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+      <AdditionalIncludeDirectories>$(EXT_PKGS)\wxMSW-2.9.2-VC10\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>wxmsw28d_xrc.lib;wxbase28d_xml.lib;wxexpatd.lib;wxmsw28d_core.lib;wxmsw28d_adv.lib;wxmsw28d_html.lib;wxbase28d.lib;wxpngd.lib;wxzlibd.lib;wxjpegd.lib;wxtiffd.lib;odbc32.lib;odbccp32.lib;comctl32.lib;rpcrt4.lib;wsock32.lib;winmm.lib;opengl32.lib;glu32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>.\$(OutDir)JazzPlusPlus.exe</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>$(EXT_PKGS)\wxMSW-2.9.2-VC10\lib\vc_lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>.\$(OutDir)JazzPlusPlus.pdb</ProgramDatabaseFile>
+      <SubSystem>Windows</SubSystem>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug GUI VC10|x64'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>X64</TargetEnvironment>
+      <TypeLibraryName>.\$(OutDir)JazzPlusPlus.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>$(EXT_PKGS)\wxMSW-2.9.2-VC10\lib\vc_lib_x64\mswud;$(EXT_PKGS)\wxMSW-2.9.2-VC10\include;..\src;..\src\mswin;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_DEBUG;_WINDOWS;WINVER=0x0501;STRICT;NOMINMAX;__WXDEBUG__;WXDEBUG=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <PrecompiledHeaderOutputFile>.\$(OutDir)JazzPlusPlus.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\$(OutDir)</AssemblerListingLocation>
+      <ObjectFileName>.\$(OutDir)</ObjectFileName>
+      <ProgramDataBaseFileName>.\$(OutDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <DisableSpecificWarnings>4351;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+      <AdditionalIncludeDirectories>$(EXT_PKGS)\wxMSW-2.9.2-VC10\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>wxmsw28d_xrc.lib;wxbase28d_xml.lib;wxexpatd.lib;wxmsw28d_core.lib;wxmsw28d_adv.lib;wxmsw28d_html.lib;wxbase28d.lib;wxpngd.lib;wxzlibd.lib;wxjpegd.lib;wxtiffd.lib;odbc32.lib;odbccp32.lib;comctl32.lib;rpcrt4.lib;wsock32.lib;winmm.lib;opengl32.lib;glu32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>.\$(OutDir)JazzPlusPlus.exe</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>$(EXT_PKGS)\wxMSW-2.9.2-VC10\lib\vc_lib_x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>.\$(OutDir)JazzPlusPlus.pdb</ProgramDatabaseFile>
+      <SubSystem>Windows</SubSystem>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release GUI VC10|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>.\$(OutDir)JazzPlusPlus.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Full</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>$(EXT_PKGS)\wxMSW-2.9.2-VC10\lib\vc_lib\mswu;$(EXT_PKGS)\wxMSW-2.9.2-VC10\include;..\src;..\src\mswin;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;WINVER=0x0400;STRICT;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <PrecompiledHeaderOutputFile>.\$(OutDir)JazzPlusPlus.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\$(OutDir)</AssemblerListingLocation>
+      <ObjectFileName>.\$(OutDir)</ObjectFileName>
+      <ProgramDataBaseFileName>.\$(OutDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>Default</CompileAs>
+      <DisableSpecificWarnings>4351;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+      <AdditionalIncludeDirectories>$(EXT_PKGS)\wxMSW-2.9.2-VC10\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>wxmsw28_xrc.lib;wxbase28_xml.lib;wxexpat.lib;wxmsw28_core.lib;wxmsw28_adv.lib;wxmsw28_html.lib;wxbase28.lib;wxpng.lib;wxzlib.lib;wxjpeg.lib;wxtiff.lib;odbc32.lib;odbccp32.lib;comctl32.lib;rpcrt4.lib;wsock32.lib;winmm.lib;opengl32.lib;glu32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>.\$(OutDir)JazzPlusPlus.exe</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>$(EXT_PKGS)\wxMSW-2.9.2-VC10\lib\vc_lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
+      <ProgramDatabaseFile>.\$(OutDir)JazzPlusPlus.pdb</ProgramDatabaseFile>
+      <SubSystem>Windows</SubSystem>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release GUI VC10|x64'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>X64</TargetEnvironment>
+      <TypeLibraryName>.\$(OutDir)JazzPlusPlus.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Full</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>$(EXT_PKGS)\wxMSW-2.9.2-VC10\lib\vc_lib_x64\mswu;$(EXT_PKGS)\wxMSW-2.9.2-VC10\include;..\src;..\src\mswin;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>NDEBUG;_WINDOWS;WINVER=0x0501;STRICT;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <PrecompiledHeaderOutputFile>.\$(OutDir)JazzPlusPlus.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\$(OutDir)</AssemblerListingLocation>
+      <ObjectFileName>.\$(OutDir)</ObjectFileName>
+      <ProgramDataBaseFileName>.\$(OutDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CallingConvention>StdCall</CallingConvention>
+      <CompileAs>Default</CompileAs>
+      <DisableSpecificWarnings>4351;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+      <AdditionalIncludeDirectories>$(EXT_PKGS)\wxMSW-2.9.2-VC10\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>wxmsw28_xrc.lib;wxbase28_xml.lib;wxexpat.lib;wxmsw28_core.lib;wxmsw28_adv.lib;wxmsw28_html.lib;wxbase28.lib;wxpng.lib;wxzlib.lib;wxjpeg.lib;wxtiff.lib;odbc32.lib;odbccp32.lib;comctl32.lib;rpcrt4.lib;wsock32.lib;winmm.lib;opengl32.lib;glu32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>.\$(OutDir)JazzPlusPlus.exe</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>$(EXT_PKGS)\wxMSW-2.9.2-VC10\lib\vc_lib_x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
+      <ProgramDatabaseFile>.\$(OutDir)JazzPlusPlus.pdb</ProgramDatabaseFile>
+      <SubSystem>Windows</SubSystem>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\src\AboutDialog.cpp" />
+    <ClCompile Include="..\src\AsciiMidiFile.cpp" />
+    <ClCompile Include="..\src\Audio.cpp" />
+    <ClCompile Include="..\src\ClockDialog.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug GUI VC10|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug GUI VC10|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release GUI VC10|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release GUI VC10|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\src\Command.cpp" />
+    <ClCompile Include="..\src\Configuration.cpp" />
+    <ClCompile Include="..\src\ControlEdit.cpp" />
+    <ClCompile Include="..\src\Dialogs.cpp" />
+    <ClCompile Include="..\src\DynamicArray.cpp" />
+    <ClCompile Include="..\src\ErrorMessage.cpp" />
+    <ClCompile Include="..\src\EventFrame.cpp" />
+    <ClCompile Include="..\src\Events.cpp" />
+    <ClCompile Include="..\src\EventWindow.cpp" />
+    <ClCompile Include="..\src\FileSelector.cpp" />
+    <ClCompile Include="..\src\Filter.cpp" />
+    <ClCompile Include="..\src\FindFile.cpp" />
+    <ClCompile Include="..\src\FrequencyTable.cpp" />
+    <ClCompile Include="..\src\GetOptionIndex.cpp" />
+    <ClCompile Include="..\src\Globals.cpp" />
+    <ClCompile Include="..\src\GuitarFrame.cpp" />
+    <ClCompile Include="..\src\GuitarSettings.cpp" />
+    <ClCompile Include="..\src\GuitarSettingsDialog.cpp" />
+    <ClCompile Include="..\src\GuitarWindow.cpp" />
+    <ClCompile Include="..\src\Harmony.cpp" />
+    <ClCompile Include="..\src\HarmonyBrowserAnalyzer.cpp" />
+    <ClCompile Include="..\src\HarmonyP.cpp" />
+    <ClCompile Include="..\src\Help.cpp" />
+    <ClCompile Include="..\src\JazzPlusPlusApplication.cpp" />
+    <ClCompile Include="..\src\KeyStringConverters.cpp" />
+    <ClCompile Include="..\src\Knob.cpp" />
+    <ClCompile Include="..\src\Mapper.cpp" />
+    <ClCompile Include="..\src\MeasureChoice.cpp" />
+    <ClCompile Include="..\src\Metronome.cpp" />
+    <ClCompile Include="..\src\MidiDeviceDialog.cpp" />
+    <ClCompile Include="..\src\MouseAction.cpp" />
+    <ClCompile Include="..\src\NamedChoice.cpp" />
+    <ClCompile Include="..\src\NamedValue.cpp" />
+    <ClCompile Include="..\src\NamedValueChoice.cpp" />
+    <ClCompile Include="..\src\PianoFrame.cpp" />
+    <ClCompile Include="..\src\PianoWindow.cpp" />
+    <ClCompile Include="..\src\Player.cpp" />
+    <ClCompile Include="..\src\PortMidiPlayer.cpp" />
+    <ClCompile Include="..\src\Project.cpp" />
+    <ClCompile Include="..\src\ProjectManager.cpp" />
+    <ClCompile Include="..\src\DeprecatedWx\prop.cpp" />
+    <ClCompile Include="..\src\PropertyListDialog.cpp" />
+    <ClCompile Include="..\src\DeprecatedWx\propform.cpp" />
+    <ClCompile Include="..\src\DeprecatedWx\proplist.cpp" />
+    <ClCompile Include="..\src\Random.cpp" />
+    <ClCompile Include="..\src\RecordingInfo.cpp" />
+    <ClCompile Include="..\src\Rectangle.cpp" />
+    <ClCompile Include="..\src\Rhythm.cpp" />
+    <ClCompile Include="..\src\Sample.cpp" />
+    <ClCompile Include="..\src\SampleCommand.cpp" />
+    <ClCompile Include="..\src\SampleDialog.cpp" />
+    <ClCompile Include="..\src\SampleWindow.cpp" />
+    <ClCompile Include="..\src\SelectControllerDialog.cpp" />
+    <ClCompile Include="..\src\Signal2.cpp" />
+    <ClCompile Include="..\src\SliderWindow.cpp" />
+    <ClCompile Include="..\src\Song.cpp" />
+    <ClCompile Include="..\src\StandardFile.cpp" />
+    <ClCompile Include="..\src\StringReadWrite.cpp" />
+    <ClCompile Include="..\src\StringUtilities.cpp" />
+    <ClCompile Include="..\src\Synth.cpp" />
+    <ClCompile Include="..\src\ToolBar.cpp" />
+    <ClCompile Include="..\src\Track.cpp" />
+    <ClCompile Include="..\src\TrackFrame.cpp" />
+    <ClCompile Include="..\src\TrackWindow.cpp" />
+    <ClCompile Include="..\src\mswin\WindowsAudioInterface.cpp" />
+    <ClCompile Include="..\src\mswin\WindowsConsole.cpp" />
+    <ClCompile Include="..\src\mswin\WindowsMidiInterface.cpp" />
+    <ClCompile Include="..\src\mswin\WindowsPlayer.cpp" />
+    <ClCompile Include="..\src\Dialogs\CleanupDialog.cpp" />
+    <ClCompile Include="..\src\Dialogs\ControllerDialog.cpp" />
+    <ClCompile Include="..\src\Dialogs\DeleteDialog.cpp" />
+    <ClCompile Include="..\src\Dialogs\EndOfTrackDialog.cpp" />
+    <ClCompile Include="..\src\Dialogs\FilterDialog.cpp" />
+    <ClCompile Include="..\src\Dialogs\IntegerEdit.cpp" />
+    <ClCompile Include="..\src\Dialogs\KeyOnDialog.cpp" />
+    <ClCompile Include="..\src\Dialogs\LengthDialog.cpp" />
+    <ClCompile Include="..\src\Dialogs\MeterChangeDialog.cpp" />
+    <ClCompile Include="..\src\Dialogs\MetronomeSettingsDialog.cpp" />
+    <ClCompile Include="..\src\Dialogs\MidiChannelDialog.cpp" />
+    <ClCompile Include="..\src\Dialogs\PitchWheelDialog.cpp" />
+    <ClCompile Include="..\src\Dialogs\ProgramChangeDialog.cpp" />
+    <ClCompile Include="..\src\Dialogs\QuantizeDialog.cpp" />
+    <ClCompile Include="..\src\Dialogs\SearchAndReplaceDialog.cpp" />
+    <ClCompile Include="..\src\Dialogs\SetTempoDialog.cpp" />
+    <ClCompile Include="..\src\Dialogs\ShiftDialog.cpp" />
+    <ClCompile Include="..\src\Dialogs\SnapDialog.cpp" />
+    <ClCompile Include="..\src\Dialogs\SynthesizerSettingsDialog.cpp" />
+    <ClCompile Include="..\src\Dialogs\SysexDialog.cpp" />
+    <ClCompile Include="..\src\Dialogs\TextDialog.cpp" />
+    <ClCompile Include="..\src\Dialogs\TrackDialog.cpp" />
+    <ClCompile Include="..\src\Dialogs\TransposeDialog.cpp" />
+    <ClCompile Include="..\src\Dialogs\VelocityDialog.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\src\AboutDialog.h" />
+    <ClInclude Include="..\src\AsciiMidiFile.h" />
+    <ClInclude Include="..\src\Audio.h" />
+    <CustomBuildStep Include="..\src\ClockDialog.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug GUI VC10|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug GUI VC10|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release GUI VC10|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release GUI VC10|x64'">true</ExcludedFromBuild>
+    </CustomBuildStep>
+    <ClInclude Include="..\src\Command.h" />
+    <ClInclude Include="..\src\Configuration.h" />
+    <ClInclude Include="..\src\ControlEdit.h" />
+    <ClInclude Include="..\src\Dialogs.h" />
+    <ClInclude Include="..\src\DynamicArray.h" />
+    <ClInclude Include="..\src\ErrorMessage.h" />
+    <ClInclude Include="..\src\EventFrame.h" />
+    <ClInclude Include="..\src\Events.h" />
+    <ClInclude Include="..\src\EventWindow.h" />
+    <ClInclude Include="..\src\FileSelector.h" />
+    <ClInclude Include="..\src\Filter.h" />
+    <ClInclude Include="..\src\FindFile.h" />
+    <ClInclude Include="..\src\FrequencyTable.h" />
+    <ClInclude Include="..\src\GetOptionIndex.h" />
+    <ClInclude Include="..\src\Globals.h" />
+    <ClInclude Include="..\src\GuitarFrame.h" />
+    <ClInclude Include="..\src\GuitarSettings.h" />
+    <ClInclude Include="..\src\GuitarSettingsDialog.h" />
+    <ClInclude Include="..\src\GuitarWindow.h" />
+    <ClInclude Include="..\src\Harmony.h" />
+    <ClInclude Include="..\src\HarmonyBrowserAnalyzer.h" />
+    <ClInclude Include="..\src\HarmonyP.h" />
+    <ClInclude Include="..\src\Help.h" />
+    <ClInclude Include="..\src\JazzPlusPlusApplication.h" />
+    <ClInclude Include="..\src\KeyStringConverters.h" />
+    <ClInclude Include="..\src\Knob.h" />
+    <ClInclude Include="..\src\Mapper.h" />
+    <ClInclude Include="..\src\MeasureChoice.h" />
+    <ClInclude Include="..\src\Metronome.h" />
+    <ClInclude Include="..\src\MidiDeviceDialog.h" />
+    <ClInclude Include="..\src\MouseAction.h" />
+    <ClInclude Include="..\src\NamedChoice.h" />
+    <ClInclude Include="..\src\NamedValue.h" />
+    <ClInclude Include="..\src\NamedValueChoice.h" />
+    <ClInclude Include="..\src\PianoFrame.h" />
+    <ClInclude Include="..\src\PianoWindow.h" />
+    <ClInclude Include="..\src\Player.h" />
+    <ClInclude Include="..\src\PortMidiPlayer.h" />
+    <ClInclude Include="..\src\Project.h" />
+    <ClInclude Include="..\src\ProjectManager.h" />
+    <ClInclude Include="..\src\DeprecatedWx\prop.h" />
+    <ClInclude Include="..\src\PropertyListDialog.h" />
+    <ClInclude Include="..\src\DeprecatedWx\propform.h" />
+    <ClInclude Include="..\src\DeprecatedWx\proplist.h" />
+    <ClInclude Include="..\src\Random.h" />
+    <ClInclude Include="..\src\RecordingInfo.h" />
+    <ClInclude Include="..\src\Rectangle.h" />
+    <ClInclude Include="..\src\Resources.h" />
+    <ClInclude Include="..\src\Rhythm.h" />
+    <ClInclude Include="..\src\Sample.h" />
+    <ClInclude Include="..\src\SampleCommand.h" />
+    <ClInclude Include="..\src\SampleDialog.h" />
+    <ClInclude Include="..\src\SampleWindow.h" />
+    <ClInclude Include="..\src\SelectControllerDialog.h" />
+    <ClInclude Include="..\src\DeprecatedWx\setup.h" />
+    <ClInclude Include="..\src\Signal2.h" />
+    <ClInclude Include="..\src\SliderWindow.h" />
+    <ClInclude Include="..\src\Song.h" />
+    <ClInclude Include="..\src\StandardFile.h" />
+    <ClInclude Include="..\src\StringReadWrite.h" />
+    <ClInclude Include="..\src\StringUtilities.h" />
+    <ClInclude Include="..\src\Synth.h" />
+    <ClInclude Include="..\src\ToolBar.h" />
+    <ClInclude Include="..\src\Track.h" />
+    <ClInclude Include="..\src\TrackFrame.h" />
+    <ClInclude Include="..\src\TrackWindow.h" />
+    <ClInclude Include="..\src\mswin\WindowsAudioInterface.h" />
+    <ClInclude Include="..\src\mswin\WindowsConsole.h" />
+    <ClInclude Include="..\src\mswin\WindowsMidiInterface.h" />
+    <ClInclude Include="..\src\mswin\WindowsPlayer.h" />
+    <ClInclude Include="..\src\Dialogs\CleanupDialog.h" />
+    <ClInclude Include="..\src\Dialogs\ControllerDialog.h" />
+    <ClInclude Include="..\src\Dialogs\DeleteDialog.h" />
+    <ClInclude Include="..\src\Dialogs\EndOfTrackDialog.h" />
+    <ClInclude Include="..\src\Dialogs\FilterDialog.h" />
+    <ClInclude Include="..\src\Dialogs\IntegerEdit.h" />
+    <ClInclude Include="..\src\Dialogs\KeyOnDialog.h" />
+    <ClInclude Include="..\src\Dialogs\LengthDialog.h" />
+    <ClInclude Include="..\src\Dialogs\MeterChangeDialog.h" />
+    <ClInclude Include="..\src\Dialogs\MetronomeSettingsDialog.h" />
+    <ClInclude Include="..\src\Dialogs\MidiChannelDialog.h" />
+    <ClInclude Include="..\src\Dialogs\PitchWheelDialog.h" />
+    <ClInclude Include="..\src\Dialogs\ProgramChangeDialog.h" />
+    <ClInclude Include="..\src\Dialogs\QuantizeDialog.h" />
+    <ClInclude Include="..\src\Dialogs\SearchAndReplaceDialog.h" />
+    <ClInclude Include="..\src\Dialogs\SetTempoDialog.h" />
+    <ClInclude Include="..\src\Dialogs\ShiftDialog.h" />
+    <ClInclude Include="..\src\Dialogs\SnapDialog.h" />
+    <ClInclude Include="..\src\Dialogs\SynthesizerSettingsDialog.h" />
+    <ClInclude Include="..\src\Dialogs\SysexDialog.h" />
+    <ClInclude Include="..\src\Dialogs\TextDialog.h" />
+    <ClInclude Include="..\src\Dialogs\TrackDialog.h" />
+    <ClInclude Include="..\src\Dialogs\TransposeDialog.h" />
+    <ClInclude Include="..\src\Dialogs\VelocityDialog.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <CustomBuild Include="..\src\HelpFiles\jazz.tex">
+      <FileType>Document</FileType>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug GUI VC10|Win32'">Performing Custom Help Build Step</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug GUI VC10|Win32'">echo cd "%(RootDir)%(Directory)"
+cd "%(RootDir)%(Directory)"
+echo $(EXT_PKGS)\wxMSW-2.9.2-VC10\bin\tex2rtf "%(Filename).tex" "%(Filename).html" -html -twice
+$(EXT_PKGS)\wxMSW-2.9.2-VC10\bin\tex2rtf "%(Filename).tex" "%(Filename).html" -html -twice
+</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug GUI VC10|Win32'">%(RootDir)%(Directory)%(Filename)_contents.html;%(RootDir)%(Directory)%(Filename).hhc;%(RootDir)%(Directory)%(Filename).hhp;%(RootDir)%(Directory)%(Filename).hhk;%(RootDir)%(Directory)%(Filename).ref;%(RootDir)%(Directory)%(Filename).con;%(RootDir)%(Directory)%(Filename).htx;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug GUI VC10|x64'">Performing Custom Help Build Step</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug GUI VC10|x64'">echo cd "%(RootDir)%(Directory)"
+cd "%(RootDir)%(Directory)"
+echo $(EXT_PKGS)\wxMSW-2.9.2-VC10\bin\tex2rtf "%(Filename).tex" "%(Filename).html" -html -twice
+$(EXT_PKGS)\wxMSW-2.9.2-VC10\bin\tex2rtf "%(Filename).tex" "%(Filename).html" -html -twice
+</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug GUI VC10|x64'">%(RootDir)%(Directory)%(Filename)_contents.html;%(RootDir)%(Directory)%(Filename).hhc;%(RootDir)%(Directory)%(Filename).hhp;%(RootDir)%(Directory)%(Filename).hhk;%(RootDir)%(Directory)%(Filename).ref;%(RootDir)%(Directory)%(Filename).con;%(RootDir)%(Directory)%(Filename).htx;%(Outputs)</Outputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release GUI VC10|Win32'">echo cd "%(RootDir)%(Directory)"
+cd "%(RootDir)%(Directory)"
+echo $(EXT_PKGS)\wxMSW-2.9.2-VC10\bin\tex2rtf "%(Filename).tex" "%(Filename).html" -html -twice
+$(EXT_PKGS)\wxMSW-2.9.2-VC10\bin\tex2rtf "%(Filename).tex" "%(Filename).html" -html -twice
+</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release GUI VC10|Win32'">%(RootDir)%(Directory)%(Filename)_contents.html;%(Outputs)</Outputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release GUI VC10|x64'">echo cd "%(RootDir)%(Directory)"
+cd "%(RootDir)%(Directory)"
+echo $(EXT_PKGS)\wxMSW-2.9.2-VC10\bin\tex2rtf "%(Filename).tex" "%(Filename).html" -html -twice
+$(EXT_PKGS)\wxMSW-2.9.2-VC10\bin\tex2rtf "%(Filename).tex" "%(Filename).html" -html -twice
+</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release GUI VC10|x64'">%(RootDir)%(Directory)%(Filename)_contents.html;%(Outputs)</Outputs>
+    </CustomBuild>
+    <None Include="..\src\Makefile.am" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="JazzPlusPlus-VC10.vcxproj">
+      <Project>{8c82269c-4753-428b-b9b1-d21b46c6ad83}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file


Property changes on: trunk/jazz/vc10/JazzPlusPlus-VC10.vcxproj
___________________________________________________________________
Added: svn:eol-style
   + native


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

SF.net SVN: jazzplusplus:[853] trunk/jazz/portmidi

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

Revision: 853
          http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=853&view=rev
Author:   pstieber
Date:     2011-07-31 01:10:16 +0000 (Sun, 31 Jul 2011)

Log Message:
-----------
Added Visual Studio .NET 2010 projects.

Added Paths:
-----------
    trunk/jazz/portmidi/pm_win/portmidi-VC10.vcxproj
    trunk/jazz/portmidi/porttime/porttime-VC10.vcxproj

Added: trunk/jazz/portmidi/pm_win/portmidi-VC10.vcxproj
===================================================================
--- trunk/jazz/portmidi/pm_win/portmidi-VC10.vcxproj	                        (rev 0)
+++ trunk/jazz/portmidi/pm_win/portmidi-VC10.vcxproj	2011-07-31 01:10:16 UTC (rev 853)
@@ -0,0 +1,211 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug VC9|Win32">
+      <Configuration>Debug VC9</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug VC9|x64">
+      <Configuration>Debug VC9</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release VC9|Win32">
+      <Configuration>Release VC9</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release VC9|x64">
+      <Configuration>Release VC9</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectName>portmidi</ProjectName>
+    <ProjectGuid>{33E3B196-B9F4-4D0A-85E1-31C7BBD4967A}</ProjectGuid>
+    <RootNamespace>portmidi</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release VC9|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug VC9|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release VC9|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug VC9|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release VC9|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug VC9|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release VC9|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug VC9|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug VC9|Win32'">BuildDir\$(Platform)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug VC9|Win32'">BuildDir\$(Platform)\$(Configuration)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release VC9|Win32'">BuildDir\$(Platform)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release VC9|Win32'">BuildDir\$(Platform)\$(Configuration)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug VC9|x64'">BuildDir\$(Platform)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug VC9|x64'">BuildDir\$(Platform)\$(Configuration)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release VC9|x64'">BuildDir\$(Platform)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release VC9|x64'">BuildDir\$(Platform)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug VC9|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\pm_common;..\porttime;..\pm_win;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;DEBUG;PM_CHECK_ERRORS;WIN32;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeaderOutputFile>.\$(OutDir)portmidi.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\$(OutDir)</AssemblerListingLocation>
+      <ObjectFileName>.\$(OutDir)</ObjectFileName>
+      <ProgramDataBaseFileName>.\$(OutDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Lib>
+      <OutputFile>.\$(OutDir)portmidi.lib</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Lib>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>.\$(OutDir)portmidi.bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release VC9|Win32'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>..\pm_common;..\porttime;..\pm_win;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeaderOutputFile>.\$(OutDir)portmidi.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\$(OutDir)</AssemblerListingLocation>
+      <ObjectFileName>.\$(OutDir)</ObjectFileName>
+      <ProgramDataBaseFileName>.\$(OutDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Lib>
+      <OutputFile>.\$(OutDir)portmidi.lib</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Lib>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>.\$(OutDir)portmidi.bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug VC9|x64'">
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\pm_common;..\porttime;..\pm_win;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;DEBUG;PM_CHECK_ERRORS;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeaderOutputFile>.\$(OutDir)portmidi.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\$(OutDir)</AssemblerListingLocation>
+      <ObjectFileName>.\$(OutDir)</ObjectFileName>
+      <ProgramDataBaseFileName>.\$(OutDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Lib>
+      <OutputFile>.\$(OutDir)portmidi.lib</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Lib>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>.\$(OutDir)portmidi.bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release VC9|x64'">
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>..\pm_common;..\porttime;..\pm_win;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeaderOutputFile>.\$(OutDir)portmidi.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\$(OutDir)</AssemblerListingLocation>
+      <ObjectFileName>.\$(OutDir)</ObjectFileName>
+      <ProgramDataBaseFileName>.\$(OutDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Lib>
+      <OutputFile>.\$(OutDir)portmidi.lib</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Lib>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>.\$(OutDir)portmidi.bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\pm_common\pmutil.c" />
+    <ClCompile Include="pmwin.c" />
+    <ClCompile Include="pmwinmm.c" />
+    <ClCompile Include="..\pm_common\portmidi.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\pm_common\pminternal.h" />
+    <ClInclude Include="..\pm_common\pmutil.h" />
+    <ClInclude Include="pmwinmm.h" />
+    <ClInclude Include="..\pm_common\portmidi.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file


Property changes on: trunk/jazz/portmidi/pm_win/portmidi-VC10.vcxproj
___________________________________________________________________
Added: svn:eol-style
   + native

Added: trunk/jazz/portmidi/porttime/porttime-VC10.vcxproj
===================================================================
--- trunk/jazz/portmidi/porttime/porttime-VC10.vcxproj	                        (rev 0)
+++ trunk/jazz/portmidi/porttime/porttime-VC10.vcxproj	2011-07-31 01:10:16 UTC (rev 853)
@@ -0,0 +1,201 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug VC9|Win32">
+      <Configuration>Debug VC9</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug VC9|x64">
+      <Configuration>Debug VC9</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release VC9|Win32">
+      <Configuration>Release VC9</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release VC9|x64">
+      <Configuration>Release VC9</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectName>porttime</ProjectName>
+    <ProjectGuid>{338224B8-D575-408D-BACF-95C557B429BE}</ProjectGuid>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug VC9|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release VC9|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug VC9|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release VC9|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug VC9|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release VC9|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug VC9|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release VC9|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release VC9|Win32'">BuildDir\$(Platform)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release VC9|Win32'">BuildDir\$(Platform)\$(Configuration)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug VC9|Win32'">BuildDir\$(Platform)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug VC9|Win32'">BuildDir\$(Platform)\$(Configuration)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release VC9|x64'">BuildDir\$(Platform)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release VC9|x64'">BuildDir\$(Platform)\$(Configuration)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug VC9|x64'">BuildDir\$(Platform)\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug VC9|x64'">BuildDir\$(Platform)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release VC9|Win32'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeaderOutputFile>.\$(OutDir)porttime.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\$(OutDir)</AssemblerListingLocation>
+      <ObjectFileName>.\$(OutDir)</ObjectFileName>
+      <ProgramDataBaseFileName>.\$(OutDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Lib>
+      <OutputFile>.\$(OutDir)porttime.lib</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Lib>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>.\$(OutDir)porttime.bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug VC9|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>_LIB;WIN32;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeaderOutputFile>.\$(OutDir)porttime.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\$(OutDir)</AssemblerListingLocation>
+      <ObjectFileName>.\$(OutDir)</ObjectFileName>
+      <ProgramDataBaseFileName>.\$(OutDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Lib>
+      <OutputFile>.\$(OutDir)porttime.lib</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Lib>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>.\$(OutDir)porttime.bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release VC9|x64'">
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <PreprocessorDefinitions>NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeaderOutputFile>.\$(OutDir)porttime.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\$(OutDir)</AssemblerListingLocation>
+      <ObjectFileName>.\$(OutDir)</ObjectFileName>
+      <ProgramDataBaseFileName>.\$(OutDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Lib>
+      <OutputFile>.\$(OutDir)porttime.lib</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Lib>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>.\$(OutDir)porttime.bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug VC9|x64'">
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>_LIB;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeaderOutputFile>.\$(OutDir)porttime.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\$(OutDir)</AssemblerListingLocation>
+      <ObjectFileName>.\$(OutDir)</ObjectFileName>
+      <ProgramDataBaseFileName>.\$(OutDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x0409</Culture>
+    </ResourceCompile>
+    <Lib>
+      <OutputFile>.\$(OutDir)porttime.lib</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Lib>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>.\$(OutDir)porttime.bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="porttime.c" />
+    <ClCompile Include="ptwinmm.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="porttime.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file


Property changes on: trunk/jazz/portmidi/porttime/porttime-VC10.vcxproj
___________________________________________________________________
Added: svn:eol-style
   + native


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

SF.net SVN: jazzplusplus:[852] trunk/jazz/src/NamedChoice.cpp

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

Revision: 852
          http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=852&view=rev
Author:   pstieber
Date:     2011-07-28 17:28:03 +0000 (Thu, 28 Jul 2011)

Log Message:
-----------
Removed in clude of DeprecatedStringUtils.h and made some cosmetic changes.

Modified Paths:
--------------
    trunk/jazz/src/NamedChoice.cpp

Modified: trunk/jazz/src/NamedChoice.cpp
===================================================================
--- trunk/jazz/src/NamedChoice.cpp	2011-07-28 17:24:14 UTC (rev 851)
+++ trunk/jazz/src/NamedChoice.cpp	2011-07-28 17:28:03 UTC (rev 852)
@@ -23,7 +23,6 @@
 #include "NamedChoice.h"
 
 #include "NamedValue.h"
-#include "DeprecatedStringUtils.h"
 #include "DeprecatedWx/proplist.h"
 
 using namespace std;
@@ -49,12 +48,17 @@
   SetValue();
 
   // following adapted from wxwin/src/base/wb_form.cc
-  wxList *list = new wxList;
+  wxList* pList = new wxList;
   for (int i = 0; mpValues[i].Name; i++)
-    if (*mpValues[i].Name)        // omit empty entries
-      list->Append((wxObject *)copystring(mpValues[i].Name));
+  {
+    // Omit empty entries.
+    if (*mpValues[i].Name)
+    {
+      pList->Append((wxObject *)copystring(mpValues[i].Name));
+    }
+  }
 
-  wxFormItemConstraint *constraint = wxMakeConstraintStrings(list);
+  wxFormItemConstraint *constraint = wxMakeConstraintStrings(pList);
   return wxMakeFormString(
      mpTitle,
      &mpSelection,


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

SF.net SVN: jazzplusplus:[851] trunk/jazz/src/Dialogs/SamplesDialog.cpp

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

Revision: 851
          http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=851&view=rev
Author:   pstieber
Date:     2011-07-28 17:24:14 +0000 (Thu, 28 Jul 2011)

Log Message:
-----------
Fixed an event table entry by adding class scope.

Modified Paths:
--------------
    trunk/jazz/src/Dialogs/SamplesDialog.cpp

Modified: trunk/jazz/src/Dialogs/SamplesDialog.cpp
===================================================================
--- trunk/jazz/src/Dialogs/SamplesDialog.cpp	2011-07-28 14:49:25 UTC (rev 850)
+++ trunk/jazz/src/Dialogs/SamplesDialog.cpp	2011-07-28 17:24:14 UTC (rev 851)
@@ -38,7 +38,7 @@
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 BEGIN_EVENT_TABLE(JZSamplesDialog, wxDialog)
-  EVT_BUTTON(IDC_BN_SD_FILE_SELECT_BROWSE, OnSelectSampleFile)
+  EVT_BUTTON(IDC_BN_SD_FILE_SELECT_BROWSE, JZSamplesDialog::OnSelectSampleFile)
 END_EVENT_TABLE()
 
 //-----------------------------------------------------------------------------


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

SF.net SVN: jazzplusplus:[850] trunk/jazz/src/Sample.cpp

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

Revision: 850
          http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=850&view=rev
Author:   pstieber
Date:     2011-07-28 14:49:25 +0000 (Thu, 28 Jul 2011)

Log Message:
-----------
Made a cosmetic indentation change.

Modified Paths:
--------------
    trunk/jazz/src/Sample.cpp

Modified: trunk/jazz/src/Sample.cpp
===================================================================
--- trunk/jazz/src/Sample.cpp	2011-07-28 14:43:42 UTC (rev 849)
+++ trunk/jazz/src/Sample.cpp	2011-07-28 14:49:25 UTC (rev 850)
@@ -716,8 +716,7 @@
   wh.sc_len = 16;
   wh.sample_fq = set.GetSamplingRate();
   wh.bit_p_spl = set.GetBitsPerSample();
-  wh.byte_p_spl =
-    set.GetChannelCount() * (set.GetBitsPerSample() > 8 ? 2 : 1);
+  wh.byte_p_spl = set.GetChannelCount() * (set.GetBitsPerSample() > 8 ? 2 : 1);
   wh.byte_p_sec = wh.byte_p_spl * wh.sample_fq;
   wh.data_length = length * sizeof(short);
   wh.length = wh.data_length + sizeof(WaveHeader);


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

SF.net SVN: jazzplusplus:[849] trunk/jazz/src/Dialogs.cpp

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

Revision: 849
          http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=849&view=rev
Author:   pstieber
Date:     2011-07-28 14:43:42 +0000 (Thu, 28 Jul 2011)

Log Message:
-----------
Removed an include of ClockDialog.h.

Modified Paths:
--------------
    trunk/jazz/src/Dialogs.cpp

Modified: trunk/jazz/src/Dialogs.cpp
===================================================================
--- trunk/jazz/src/Dialogs.cpp	2011-07-28 13:27:25 UTC (rev 848)
+++ trunk/jazz/src/Dialogs.cpp	2011-07-28 14:43:42 UTC (rev 849)
@@ -22,7 +22,6 @@
 
 #include "Dialogs.h"
 
-#include "ClockDialog.h"
 #include "Command.h"
 #if 0
 #include "DeprecatedWx/proplist.h"


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

SF.net SVN: jazzplusplus:[848] trunk/jazz/vc9/JazzPlusPlus-VC9.vcproj

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

Revision: 848
          http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=848&view=rev
Author:   pstieber
Date:     2011-07-28 13:27:25 +0000 (Thu, 28 Jul 2011)

Log Message:
-----------
Removed the ClockDialog code.

Modified Paths:
--------------
    trunk/jazz/vc9/JazzPlusPlus-VC9.vcproj

Modified: trunk/jazz/vc9/JazzPlusPlus-VC9.vcproj
===================================================================
--- trunk/jazz/vc9/JazzPlusPlus-VC9.vcproj	2011-07-28 13:25:07 UTC (rev 847)
+++ trunk/jazz/vc9/JazzPlusPlus-VC9.vcproj	2011-07-28 13:27:25 UTC (rev 848)
@@ -446,78 +446,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\src\ClockDialog.cpp"
-				>
-				<FileConfiguration
-					Name="Debug GUI VC9|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug GUI VC9|x64"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release GUI VC9|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release GUI VC9|x64"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\src\ClockDialog.h"
-				>
-				<FileConfiguration
-					Name="Debug GUI VC9|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug GUI VC9|x64"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release GUI VC9|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release GUI VC9|x64"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCustomBuildTool"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
 				RelativePath="..\src\Command.cpp"
 				>
 			</File>


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

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

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

Revision: 847
          http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=847&view=rev
Author:   pstieber
Date:     2011-07-28 13:25:07 +0000 (Thu, 28 Jul 2011)

Log Message:
-----------
Removed the old clock code.

Modified Paths:
--------------
    trunk/jazz/src/Makefile.am

Removed Paths:
-------------
    trunk/jazz/src/ClockDialog.cpp
    trunk/jazz/src/ClockDialog.h

Deleted: trunk/jazz/src/ClockDialog.cpp
===================================================================
--- trunk/jazz/src/ClockDialog.cpp	2011-07-28 12:52:40 UTC (rev 846)
+++ trunk/jazz/src/ClockDialog.cpp	2011-07-28 13:25:07 UTC (rev 847)
@@ -1,67 +0,0 @@
-//*****************************************************************************
-// The JAZZ++ Midi Sequencer
-//
-// Copyright (C) 1994-2000 Andreas Voss and Per Sigmond, all rights reserved.
-// Modifications Copyright (C) 2004 Patrick Earl
-// Modifications Copyright (C) 2008-2010 Peter J. Stieber
-//
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-//*****************************************************************************
-
-#include "ClockDialog.h"
-
-#include "Song.h"
-#include "DeprecatedStringUtils.h"
-#include "DeprecatedWx/proplist.h"
-
-#include <string>
-
-using namespace std;
-
-//*****************************************************************************
-// Description:
-//   This is the clock dialog class declaration.
-//*****************************************************************************
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-JZClockDialog::JZClockDialog(JZSong* pSong, const char* pTitle, int Clock)
-{
-  pSong->ClockToString(Clock, mString);
-  mpTitle = pTitle;
-  mpSong = pSong;
-}
-
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-JZClockDialog::~JZClockDialog()
-{
-}
-
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-wxProperty* JZClockDialog::mkProperty()
-{
-  return new wxProperty(
-    mpTitle,
-    wxPropertyValue((char**)&mString.c_str()),
-    "string");
-}
-
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-int JZClockDialog::GetClock()
-{
-  return mpSong->StringToClock(mString.c_str());
-}

Deleted: trunk/jazz/src/ClockDialog.h
===================================================================
--- trunk/jazz/src/ClockDialog.h	2011-07-28 12:52:40 UTC (rev 846)
+++ trunk/jazz/src/ClockDialog.h	2011-07-28 13:25:07 UTC (rev 847)
@@ -1,54 +0,0 @@
-//*****************************************************************************
-// The JAZZ++ Midi Sequencer
-//
-// Copyright (C) 1994-2000 Andreas Voss and Per Sigmond, all rights reserved.
-// Modifications Copyright (C) 2004 Patrick Earl
-// Modifications Copyright (C) 2008-2010 Peter J. Stieber
-//
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-//*****************************************************************************
-
-#ifndef JZ_CLOCKDIALOG_H
-#define JZ_CLOCKDIALOG_H
-
-class JZSong;
-class wxProperty;
-
-//*****************************************************************************
-//*****************************************************************************
-class JZClockDialog
-{
-  public:
-
-    JZClockDialog(JZSong* pSong, const char* pTitle, int Clock);
-
-    ~JZClockDialog();
-
-//    wxFormItem *mkFormItem(int w);
-
-    wxProperty* mkProperty();
-
-    int GetClock();
-
-  private:
-
-    char* mpString;
-
-    const char* mpTitle;
-
-    JZSong* mpSong;
-};
-
-#endif // !defined(JZ_CLOCKDIALOG_H)

Modified: trunk/jazz/src/Makefile.am
===================================================================
--- trunk/jazz/src/Makefile.am	2011-07-28 12:52:40 UTC (rev 846)
+++ trunk/jazz/src/Makefile.am	2011-07-28 13:25:07 UTC (rev 847)
@@ -14,7 +14,6 @@
 AsciiMidiFile.cpp \
 Audio.cpp \
 AudioDriver.cpp \
-ClockDialog.cpp \
 Command.cpp \
 Configuration.cpp \
 ControlEdit.cpp \
@@ -112,7 +111,6 @@
 AboutDialog.cpp \
 AsciiMidiFile.cpp \
 Audio.cpp \
-ClockDialog.cpp \
 Command.cpp \
 Configuration.cpp \
 ControlEdit.cpp \
@@ -215,7 +213,6 @@
 AsciiMidiFile.h \
 Audio.h \
 AudioDriver.h \
-ClockDialog.h \
 Command.h \
 Configuration.h \
 ControlEdit.h \


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

SF.net SVN: jazzplusplus:[846] trunk/jazz/src/AlsaPlayer.cpp

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

Revision: 846
          http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=846&view=rev
Author:   pstieber
Date:     2011-07-28 12:52:40 +0000 (Thu, 28 Jul 2011)

Log Message:
-----------
Updated Linux code (Events -> mppEvents).

Modified Paths:
--------------
    trunk/jazz/src/AlsaPlayer.cpp

Modified: trunk/jazz/src/AlsaPlayer.cpp
===================================================================
--- trunk/jazz/src/AlsaPlayer.cpp	2011-07-28 12:36:39 UTC (rev 845)
+++ trunk/jazz/src/AlsaPlayer.cpp	2011-07-28 12:52:40 UTC (rev 846)
@@ -645,7 +645,7 @@
   }
 
   play_clock = Now;
-  if (mPlayBuffer.nEvents && mPlayBuffer.Events[0]->GetClock() < mOutClock)
+  if (mPlayBuffer.nEvents && mPlayBuffer.mppEvents[0]->GetClock() < mOutClock)
   {
     FlushToDevice();
   }


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

SF.net SVN: jazzplusplus:[845] trunk/jazz

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

Revision: 845
          http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=845&view=rev
Author:   pstieber
Date:     2011-07-28 12:36:39 +0000 (Thu, 28 Jul 2011)

Log Message:
-----------
Changed to remove the need for DeprecatedStringUtils.cpp and DeprecatedStringUtils.h.

Modified Paths:
--------------
    trunk/jazz/src/Audio.cpp
    trunk/jazz/src/ClockDialog.cpp
    trunk/jazz/src/Dialogs.cpp
    trunk/jazz/src/FileSelector.cpp
    trunk/jazz/src/FileSelector.h
    trunk/jazz/src/Harmony.cpp
    trunk/jazz/src/Makefile.am
    trunk/jazz/src/Player.h
    trunk/jazz/src/Rhythm.cpp
    trunk/jazz/src/Rhythm.h
    trunk/jazz/src/Sample.cpp
    trunk/jazz/src/SampleDialog.cpp
    trunk/jazz/src/SampleDialog.h
    trunk/jazz/src/Track.cpp
    trunk/jazz/vc9/JazzPlusPlus-VC9.vcproj

Removed Paths:
-------------
    trunk/jazz/src/DeprecatedStringUtils.cpp
    trunk/jazz/src/DeprecatedStringUtils.h

Modified: trunk/jazz/src/Audio.cpp
===================================================================
--- trunk/jazz/src/Audio.cpp	2011-07-27 14:22:13 UTC (rev 844)
+++ trunk/jazz/src/Audio.cpp	2011-07-28 12:36:39 UTC (rev 845)
@@ -689,10 +689,10 @@
     wxText* pFile;
 #endif // OBSOLETE
 
-    static char* mpSamplePath;
+    static wxString mSamplePath;
     static int  current;
 
-    char* ListEntry(int i);
+    std::string ListEntry(int i);
     void Sample2Win(int index);
     void Win2Sample(int index);
     void SetCurrentListEntry(int i);
@@ -721,19 +721,18 @@
         "44100",
         0
       };
-      speed    = mSampleSet.GetSamplingRate();
-      speedstr = 0;
+      speed = mSampleSet.GetSamplingRate();
       for (int i = 0; speedtxt[i]; i++)
       {
         strlist.Append((wxObject*)speedtxt[i]);  // ???
         if (atol(speedtxt[i]) == speed)
         {
-          speedstr = copystring(speedtxt[i]);
+          mSpeedString = speedtxt[i];
         }
       }
-      if (!speedstr)
+      if (mSpeedString.empty())
       {
-        speedstr = copystring(speedtxt[0]);
+        mSpeedString = speedtxt[0];
       }
 
       enable = gpMidiPlayer->GetAudioEnabled();
@@ -742,8 +741,8 @@
 
       Add(wxMakeFormBool("Enable Audio", &enable));
       Add(wxMakeFormNewLine());
-      //Add(wxMakeFormString("Sample Freq", (char**)&speedstr, wxFORM_CHOICE,
-      Add(wxMakeFormString("Sample Freq", (char**)&speedstr, wxFORM_DEFAULT,
+      //Add(wxMakeFormString("Sample Freq", (char**)&mSpeedString, wxFORM_CHOICE,
+      Add(wxMakeFormString("Sample Freq", (char**)&mSpeedString.c_str(), wxFORM_DEFAULT,
           new wxList(wxMakeConstraintStrings(&strlist), 0), NULL, wxHORIZONTAL));
       Add(wxMakeFormNewLine());
       Add(wxMakeFormBool("Stereo", &stereo));
@@ -772,7 +771,8 @@
         return;
       wxBeginBusyCursor();
       mSampleSet.mpGlobalSettingsDialog = 0;
-      speed = atol(speedstr);
+      istringstream Iss(mSpeedString);
+      Iss >> speed;
       mSampleSet.SetSamplingRate(speed);
       mSampleSet.SetChannelCount(stereo ? 2 : 1);
       mSampleSet.SetSoftSync(mSoftwareSynchonization);
@@ -817,7 +817,7 @@
     wxList  strlist;
 
     long speed;
-    const char* speedstr;
+    const std::string mSpeedString;
     bool enable;
     bool stereo;
     bool mSoftwareSynchonization;
@@ -1134,7 +1134,7 @@
 #if 0
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
-char* JZSamplesDlg::mpSamplePath = 0;
+wxString JZSamplesDlg::mSamplePath;
 int   JZSamplesDlg::current = 0;
 
 //-----------------------------------------------------------------------------
@@ -1143,9 +1143,9 @@
   : wxDialog(pParent, wxID_ANY, wxString("Sample Settings")),
     set(s)
 {
-  if (mpSamplePath == 0)
+  if (mSamplePath.empty())
   {
-    mpSamplePath = copystring("*.wav");
+    mSamplePath = "*.wav";
   }
 
   wxArrayString SampleNames;
@@ -1199,12 +1199,12 @@
 
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
-char* JZSamplesDlg::ListEntry(int i)
+string JZSamplesDlg::ListEntry(int i)
 {
   ostringstream Oss;
   Oss << i + 1 << ' ' << set.mSamples[i]->GetLabel();
 //  KeyToString(i, buf + strlen(buf));
-  return copystring(Oss.str().c_str());
+  return Oss.str();
 }
 
 //-----------------------------------------------------------------------------
@@ -1241,9 +1241,8 @@
 {
   if (i >= 0)
   {
-    current = i;
-    mpListBox->SetString(current, ListEntry(current));
-    mpListBox->SetSelection(current, true);
+    mpListBox->SetString(current, ListEntry(i));
+    mpListBox->SetSelection(i, true);
   }
 }
 
@@ -1275,7 +1274,7 @@
 void JZSamplesDlg::OnAddButton()
 {
   wxString FileName = file_selector(
-    mpSamplePath,
+    mSamplePath,
     "Load Sample",
     false,
     false,

Modified: trunk/jazz/src/ClockDialog.cpp
===================================================================
--- trunk/jazz/src/ClockDialog.cpp	2011-07-27 14:22:13 UTC (rev 844)
+++ trunk/jazz/src/ClockDialog.cpp	2011-07-28 12:36:39 UTC (rev 845)
@@ -38,9 +38,7 @@
 //-----------------------------------------------------------------------------
 JZClockDialog::JZClockDialog(JZSong* pSong, const char* pTitle, int Clock)
 {
-  string ClockString;
-  pSong->ClockToString(Clock, ClockString);
-  mpString = copystring(ClockString.c_str());
+  pSong->ClockToString(Clock, mString);
   mpTitle = pTitle;
   mpSong = pSong;
 }
@@ -49,7 +47,6 @@
 //-----------------------------------------------------------------------------
 JZClockDialog::~JZClockDialog()
 {
-  delete mpString;
 }
 
 //-----------------------------------------------------------------------------
@@ -58,7 +55,7 @@
 {
   return new wxProperty(
     mpTitle,
-    wxPropertyValue((char**)&mpString),
+    wxPropertyValue((char**)&mString.c_str()),
     "string");
 }
 
@@ -66,5 +63,5 @@
 //-----------------------------------------------------------------------------
 int JZClockDialog::GetClock()
 {
-  return mpSong->StringToClock(mpString);
+  return mpSong->StringToClock(mString.c_str());
 }

Deleted: trunk/jazz/src/DeprecatedStringUtils.cpp
===================================================================
--- trunk/jazz/src/DeprecatedStringUtils.cpp	2011-07-27 14:22:13 UTC (rev 844)
+++ trunk/jazz/src/DeprecatedStringUtils.cpp	2011-07-28 12:36:39 UTC (rev 845)
@@ -1,36 +0,0 @@
-//*****************************************************************************
-// The JAZZ++ Midi Sequencer
-//
-// Copyright (C) 1994-2000 Andreas Voss and Per Sigmond, all rights reserved.
-// Modifications Copyright (C) 2004 Patrick Earl
-// Modifications Copyright (C) 2008-2010 Peter J. Stieber
-//
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-//*****************************************************************************
-
-#include <cstring>
-
-//*****************************************************************************
-// Description:
-//   This code used to be include with old versions of wxWidgets.  The code
-// make a copy of the passed string using 'new'.
-//*****************************************************************************
-char* copystring(const char* pString)
-{
-  int Length = strlen(pString);
-  char* pNewString = new char[Length + 1];
-  strcpy(pNewString, pString);
-  return pNewString;
-}

Deleted: trunk/jazz/src/DeprecatedStringUtils.h
===================================================================
--- trunk/jazz/src/DeprecatedStringUtils.h	2011-07-27 14:22:13 UTC (rev 844)
+++ trunk/jazz/src/DeprecatedStringUtils.h	2011-07-28 12:36:39 UTC (rev 845)
@@ -1,33 +0,0 @@
-//*****************************************************************************
-// The JAZZ++ Midi Sequencer
-//
-// Copyright (C) 1994-2000 Andreas Voss and Per Sigmond, all rights reserved.
-// Modifications Copyright (C) 2004 Patrick Earl
-// Modifications Copyright (C) 2008-2010 Peter J. Stieber
-//
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-//*****************************************************************************
-
-#ifndef JZ_DEPRECATEDSTRINGUTILS_H
-#define JZ_DEPRECATEDSTRINGUTILS_H
-
-//*****************************************************************************
-// Description:
-//   This code used to be include with old versions of wxWidgets.  The code
-// make a copy of the passed string using 'new'.
-//*****************************************************************************
-char* copystring(const char *s);
-
-#endif // !defined(JZ_DEPRECATEDSTRINGUTILS_H)

Modified: trunk/jazz/src/Dialogs.cpp
===================================================================
--- trunk/jazz/src/Dialogs.cpp	2011-07-27 14:22:13 UTC (rev 844)
+++ trunk/jazz/src/Dialogs.cpp	2011-07-28 12:36:39 UTC (rev 845)
@@ -40,7 +40,7 @@
 #include "Filter.h"
 #include "Globals.h"
 #include "Help.h"
-#include "NamedChoice.h"
+//#include "NamedChoice.h"
 #include "PianoFrame.h"
 #include "PianoWindow.h"
 #include "Player.h"
@@ -475,14 +475,14 @@
   switch (pEvent->GetStat())
   {
     case StatKeyOn:
-      if (pTrack->GetAudioMode())
-      {
-        if (!gpMidiPlayer->IsPlaying())
-        {
-          gpMidiPlayer->EditSample(pEvent->IsKeyOn()->GetKey());
-        }
-        break;
-      }
+//      if (pTrack->GetAudioMode())
+//      {
+//        if (!gpMidiPlayer->IsPlaying())
+//        {
+//          gpMidiPlayer->EditSample(pEvent->IsKeyOn()->GetKey());
+//        }
+//        break;
+//      }
 
       {
         JZKeyOnDialog KeyOnDialog(pEvent->IsKeyOn(), pTrack, pPianoWindow);

Modified: trunk/jazz/src/FileSelector.cpp
===================================================================
--- trunk/jazz/src/FileSelector.cpp	2011-07-27 14:22:13 UTC (rev 844)
+++ trunk/jazz/src/FileSelector.cpp	2011-07-28 12:36:39 UTC (rev 845)
@@ -28,9 +28,9 @@
 // Description:
 //   Add a supplied extension to a file name if the file name doesn't already
 // have an extension.
-//   ext is assumed to have a leading dot. (.mid for example)
+//   Extension is assumed to have a leading dot. (.mid for example)
 //*****************************************************************************
-wxString add_default_ext(const wxString fn, const wxString ext)
+wxString add_default_ext(const wxString fn, const wxString Extension)
 
 {
   // Is any extension already there?
@@ -45,7 +45,7 @@
 
   // Otherwise append the supplied extension and return
   wxString RevisedFileName = fn;
-  RevisedFileName += ext;
+  RevisedFileName += Extension;
   return RevisedFileName;
 }
 
@@ -60,29 +60,29 @@
 //     This is the file name.
 //*****************************************************************************
 wxString file_selector(
-  wxString deffile,
+  wxString DefaultFileName,
   const wxString title,
   bool save,
   bool changed,
-  const wxString ext)
+  const wxString Extension)
 {
    wxString file;
    wxString path;
 
    if (save)
    {
-     file = wxFileNameFromPath(deffile);
+     file = wxFileNameFromPath(DefaultFileName);
    }
 
-   path = wxPathOnly(deffile);
+   path = wxPathOnly(DefaultFileName);
 
    int flags = save ? wxFD_SAVE : wxFD_OPEN;
-   wxString s = wxFileSelector(title, path, file, 0, ext, flags);
+   wxString s = wxFileSelector(title, path, file, 0, Extension, flags);
 
   // add extension if missing
-   if (!s.empty() && ext)
+   if (!s.empty() && Extension)
   {
-    s = add_default_ext(s, ext);
+    s = add_default_ext(s, Extension);
   }
 
   // warn if overwriting existent file
@@ -104,7 +104,7 @@
   if (s && !save && changed)
   {
     wxString buf;
-    buf<<deffile;
+    buf << DefaultFileName;
     buf <<" has changed. Load anyway?";
     if (wxMessageBox(buf, "Load ?", wxYES_NO) == wxNO)
     {
@@ -124,11 +124,10 @@
     }
   }
 
-  if (s!=wxEmptyString)
+  if (s != wxEmptyString)
   {
-    //delete [] deffile;
-    //deffile = s;
-    //return deffile;
+    //DefaultFileName = s;
+    //return DefaultFileName;
     //i dont understand the point of the above original construct
 //     wxString rv=*(new wxString(s));
 //     return rv;//copy the local string and return it

Modified: trunk/jazz/src/FileSelector.h
===================================================================
--- trunk/jazz/src/FileSelector.h	2011-07-27 14:22:13 UTC (rev 844)
+++ trunk/jazz/src/FileSelector.h	2011-07-28 12:36:39 UTC (rev 845)
@@ -24,7 +24,7 @@
 #define JZ_FILESELECTOR_H
 
 wxString file_selector(
-  wxString DefaultFile,
+  wxString DefaultFileName,
   const wxString Title,
   bool Sve,
   bool Changed,

Modified: trunk/jazz/src/Harmony.cpp
===================================================================
--- trunk/jazz/src/Harmony.cpp	2011-07-27 14:22:13 UTC (rev 844)
+++ trunk/jazz/src/Harmony.cpp	2011-07-28 12:36:39 UTC (rev 845)
@@ -591,7 +591,7 @@
 
     int mSequenceCount;
 
-    std::string mDefaultFileName;
+    wxString mDefaultFileName;
 
     bool mHasChanged;
 
@@ -836,8 +836,15 @@
 
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
-JZHarmonyBrowserCanvas::JZHarmonyBrowserCanvas(wxFrame* pParent, int x, int y, int w, int h)
-  : wxScrolledWindow(pParent, wxID_ANY, wxPoint(x, y), wxSize(w, h))
+JZHarmonyBrowserCanvas::JZHarmonyBrowserCanvas(
+  wxFrame* pParent,
+  int x,
+  int y,
+  int w,
+  int h)
+  : wxScrolledWindow(pParent, wxID_ANY, wxPoint(x, y), wxSize(w, h)),
+    mDefaultFileName("noname.har")
+
 {
   mSequenceCount  = 0;
 
@@ -876,7 +883,6 @@
   }
 
 
-  mDefaultFileName = "noname.har";
   mHasChanged      = false;
 
   SetScrollbars(0, (int)(mChordHeight + 0.5), 0, 12 + SEQMAX / 8 + 2, 0, 0);
@@ -1435,7 +1441,7 @@
 void JZHarmonyBrowserCanvas::FileLoad()
 {
   wxString FileName = file_selector(
-    mDefaultFileName.c_str(),
+    mDefaultFileName,
     "Load Harmonies",
     false,
     mHasChanged,
@@ -1453,7 +1459,7 @@
 void JZHarmonyBrowserCanvas::FileSaveAs()
 {
   wxString FileName = file_selector(
-    mDefaultFileName.c_str(),
+    mDefaultFileName,
     "Save Harmonies",
     true,
     mHasChanged,

Modified: trunk/jazz/src/Makefile.am
===================================================================
--- trunk/jazz/src/Makefile.am	2011-07-27 14:22:13 UTC (rev 844)
+++ trunk/jazz/src/Makefile.am	2011-07-28 12:36:39 UTC (rev 845)
@@ -18,7 +18,6 @@
 Command.cpp \
 Configuration.cpp \
 ControlEdit.cpp \
-DeprecatedStringUtils.cpp \
 DeprecatedWx/prop.cpp \
 DeprecatedWx/propform.cpp \
 DeprecatedWx/proplist.cpp \
@@ -117,7 +116,6 @@
 Command.cpp \
 Configuration.cpp \
 ControlEdit.cpp \
-DeprecatedStringUtils.cpp \
 DeprecatedWx/prop.cpp \
 DeprecatedWx/propform.cpp \
 DeprecatedWx/proplist.cpp \
@@ -224,7 +222,6 @@
 DeprecatedWx/prop.h \
 DeprecatedWx/propform.h \
 DeprecatedWx/proplist.h \
-DeprecatedStringUtils.h \
 Dialogs/AudioSettingsDialog.h \
 Dialogs/CleanupDialog.h \
 Dialogs/ControllerDialog.h \

Modified: trunk/jazz/src/Player.h
===================================================================
--- trunk/jazz/src/Player.h	2011-07-27 14:22:13 UTC (rev 844)
+++ trunk/jazz/src/Player.h	2011-07-28 12:36:39 UTC (rev 845)
@@ -31,7 +31,6 @@
 #include "Song.h"
 //#include "midinet.h"
 #include "Audio.h"
-#include "DeprecatedStringUtils.h"
 
 #include <sys/types.h>
 #include <time.h>

Modified: trunk/jazz/src/Rhythm.cpp
===================================================================
--- trunk/jazz/src/Rhythm.cpp	2011-07-27 14:22:13 UTC (rev 844)
+++ trunk/jazz/src/Rhythm.cpp	2011-07-28 12:36:39 UTC (rev 845)
@@ -23,7 +23,6 @@
 #include "Rhythm.h"
 
 #include "Command.h"
-#include "DeprecatedStringUtils.h"
 #include "EventWindow.h"
 #include "FileSelector.h"
 #include "Filter.h"
@@ -524,13 +523,13 @@
       wxSize(640, 580)),
     edit(0),
     mpEventWindow(pEventWindow),
-    mpSong(pSong)
+    mpSong(pSong),
+    mDefaultFileName("noname.rhy")
 {
 #ifdef OBSOLETE
   in_create        = 1;
   n_instruments    = 0;
   act_instrument   = -1;
-  default_filename = copystring("noname.rhy");
   has_changed      = false;
 
   JZToolDef tdefs[] =
@@ -763,7 +762,7 @@
     case wxID_OPEN:
       {
         wxString fname = file_selector(
-          default_filename,
+          mDefaultFileName,
           "Load Rhythm",
           false,
           has_changed,
@@ -781,7 +780,7 @@
       {
         Win2Instrument();
         wxString fname = file_selector(
-          default_filename,
+          mDefaultFileName,
           "Save Rhythm",
           true,
           has_changed,

Modified: trunk/jazz/src/Rhythm.h
===================================================================
--- trunk/jazz/src/Rhythm.h	2011-07-27 14:22:13 UTC (rev 844)
+++ trunk/jazz/src/Rhythm.h	2011-07-28 12:36:39 UTC (rev 845)
@@ -233,7 +233,7 @@
 
     void RndEnable();
 
-    char *default_filename;
+    wxString mDefaultFileName;
     bool has_changed;
     wxToolBar* mpToolBar;
     float tb_width, tb_height;

Modified: trunk/jazz/src/Sample.cpp
===================================================================
--- trunk/jazz/src/Sample.cpp	2011-07-27 14:22:13 UTC (rev 844)
+++ trunk/jazz/src/Sample.cpp	2011-07-28 12:36:39 UTC (rev 845)
@@ -25,7 +25,6 @@
 #include "Audio.h"
 #include "Random.h"
 #include "SampleCommand.h"
-#include "DeprecatedStringUtils.h"
 #include "Mapper.h"
 
 #include <cassert>

Modified: trunk/jazz/src/SampleDialog.cpp
===================================================================
--- trunk/jazz/src/SampleDialog.cpp	2011-07-27 14:22:13 UTC (rev 844)
+++ trunk/jazz/src/SampleDialog.cpp	2011-07-28 12:36:39 UTC (rev 845)
@@ -30,7 +30,6 @@
 #include "Song.h"   // Speed()
 #include "ToolBar.h"
 #include "FileSelector.h"
-#include "DeprecatedStringUtils.h"
 #include "Help.h"
 
 #include <wx/checkbox.h>
@@ -496,11 +495,11 @@
 
 
 JZSynthDlg::JZSynthDlg(JZSampleFrame& SampleFrame)
-: JZSliderWindow(&SampleFrame, "Additive Synthesis", geo, syn_tdefs),
-  win(SampleFrame)
+  : JZSliderWindow(&SampleFrame, "Additive Synthesis", geo, syn_tdefs),
+    win(SampleFrame),
+    mDefaultFileName("noname.syn")
 {
   Initialize();
-  default_filename = copystring("noname.syn");
 }
 
 JZSynthDlg::~JZSynthDlg()
@@ -508,7 +507,6 @@
   int i;
   for (i = 0; i < MAXSYNTHS; i++)
     delete synths[i];
-  delete [] default_filename;
 }
 
 ostream& operator << (ostream& Os, JZSynthDlg const &a)
@@ -620,7 +618,12 @@
   {
     case SYN_LOAD:
       {
-        wxString fname = file_selector(default_filename, "Load Synth", 0, 0, "*.syn");
+        wxString fname = file_selector(
+          mDefaultFileName,
+          "Load Synth",
+          0,
+          0,
+          "*.syn");
         if (fname)
         {
           ifstream is(fname);
@@ -637,7 +640,12 @@
 
     case SYN_SAVE:
       {
-        wxString fname = file_selector(default_filename, "Save Synth", 1, 0, "*.syn");
+        wxString fname = file_selector(
+          mDefaultFileName,
+          "Save Synth",
+          1,
+          0,
+          "*.syn");
         if (fname)
         {
           ofstream os(fname);

Modified: trunk/jazz/src/SampleDialog.h
===================================================================
--- trunk/jazz/src/SampleDialog.h	2011-07-27 14:22:13 UTC (rev 844)
+++ trunk/jazz/src/SampleDialog.h	2011-07-28 12:36:39 UTC (rev 845)
@@ -150,7 +150,7 @@
     static bool noise_enable;
 
     static int geo[4];
-    char *default_filename;
+    wxString mDefaultFileName;
 };
 
 

Modified: trunk/jazz/src/Track.cpp
===================================================================
--- trunk/jazz/src/Track.cpp	2011-07-27 14:22:13 UTC (rev 844)
+++ trunk/jazz/src/Track.cpp	2011-07-28 12:36:39 UTC (rev 845)
@@ -1682,7 +1682,7 @@
 {
   JZTrackWindow* TrackWin;
   JZTrack *trk;
-  char *TrackName;
+  std::string& mTrackName;
   JZNamedChoice PatchChoice;
   JZNamedChoice DeviceChoice;
   int PatchNr;
@@ -1733,13 +1733,13 @@
   if (ClearTrack)
   {
     trk->Clear();
-    delete TrackName;
+    mTrackName.clear();
     TrackWin->Redraw();
     wxForm::OnOk();
     return;
   }
-  trk->SetName(TrackName);
-  delete TrackName;
+  trk->SetName(mTrackName);
+  mTrackName.clear();
   PatchChoice.GetValue();
   DeviceChoice.GetValue();
   BankNr = (PatchNr & 0x0000ff00) >> 8;

Modified: trunk/jazz/vc9/JazzPlusPlus-VC9.vcproj
===================================================================
--- trunk/jazz/vc9/JazzPlusPlus-VC9.vcproj	2011-07-27 14:22:13 UTC (rev 844)
+++ trunk/jazz/vc9/JazzPlusPlus-VC9.vcproj	2011-07-28 12:36:39 UTC (rev 845)
@@ -542,14 +542,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\src\DeprecatedStringUtils.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\src\DeprecatedStringUtils.h"
-				>
-			</File>
-			<File
 				RelativePath="..\src\Dialogs.cpp"
 				>
 			</File>
@@ -776,10 +768,26 @@
 			<File
 				RelativePath="..\src\NamedChoice.cpp"
 				>
+				<FileConfiguration
+					Name="Debug GUI VC9|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\src\NamedChoice.h"
 				>
+				<FileConfiguration
+					Name="Debug GUI VC9|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+					/>
+				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\src\NamedValue.cpp"


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

SF.net SVN: jazzplusplus:[844] trunk/jazz/src/Configuration.cpp

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

Revision: 844
          http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=844&view=rev
Author:   pstieber
Date:     2011-07-27 14:22:13 +0000 (Wed, 27 Jul 2011)

Log Message:
-----------
Fixed drum set reading.

Modified Paths:
--------------
    trunk/jazz/src/Configuration.cpp

Modified: trunk/jazz/src/Configuration.cpp
===================================================================
--- trunk/jazz/src/Configuration.cpp	2011-07-27 01:43:39 UTC (rev 843)
+++ trunk/jazz/src/Configuration.cpp	2011-07-27 14:22:13 UTC (rev 844)
@@ -917,6 +917,10 @@
           int Value;
           istringstream Iss(InputLine);
           Iss >> Value;
+          if (Iss.fail())
+          {
+            cout << "Unable to read index." << endl;
+          }
 
           if (gpConfig->GetValue(C_UseTwoCommandBankSelect))
           {
@@ -928,6 +932,9 @@
           }
           mDrumSets[DrumsetIndex + 1].second = Value + 1;
 
+          string SetName;
+          Iss >> SetName;
+
           string DrumSetName =
             TNStringUtilities::TrimLeadingAndTrailingBlanks(Iss.str());
 


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