You can subscribe to this list here.
2008 |
Jan
|
Feb
|
Mar
(58) |
Apr
(100) |
May
(92) |
Jun
(12) |
Jul
|
Aug
|
Sep
(5) |
Oct
(1) |
Nov
(26) |
Dec
(29) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2009 |
Jan
(31) |
Feb
(20) |
Mar
(1) |
Apr
|
May
(5) |
Jun
(10) |
Jul
|
Aug
(2) |
Sep
|
Oct
(2) |
Nov
|
Dec
(1) |
2010 |
Jan
(1) |
Feb
(1) |
Mar
|
Apr
(36) |
May
(10) |
Jun
|
Jul
(38) |
Aug
(2) |
Sep
|
Oct
|
Nov
|
Dec
|
2011 |
Jan
|
Feb
(6) |
Mar
(8) |
Apr
|
May
|
Jun
|
Jul
(14) |
Aug
(56) |
Sep
|
Oct
|
Nov
|
Dec
|
2012 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(13) |
Dec
(2) |
2013 |
Jan
(30) |
Feb
|
Mar
(43) |
Apr
(28) |
May
|
Jun
|
Jul
(2) |
Aug
|
Sep
|
Oct
(10) |
Nov
(2) |
Dec
|
2014 |
Jan
|
Feb
(2) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
From: <pst...@us...> - 2013-01-06 22:53:50
|
Revision: 943 http://sourceforge.net/p/jazzplusplus/code/943 Author: pstieber Date: 2013-01-06 22:53:47 +0000 (Sun, 06 Jan 2013) Log Message: ----------- Changed the way the "none string" was initialized. Modified Paths: -------------- trunk/jazz/src/Configuration.cpp Modified: trunk/jazz/src/Configuration.cpp =================================================================== --- trunk/jazz/src/Configuration.cpp 2013-01-06 22:49:35 UTC (rev 942) +++ trunk/jazz/src/Configuration.cpp 2013-01-06 22:53:47 UTC (rev 943) @@ -304,7 +304,7 @@ mDrumNames.push_back(make_pair("", i)); } - const string NoneString = "None"; + const string NoneString("None"); mDrumSets.push_back(make_pair(NoneString, 0)); for (int i = 1; i < 130; ++i) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pst...@us...> - 2013-01-06 22:49:38
|
Revision: 942 http://sourceforge.net/p/jazzplusplus/code/942 Author: pstieber Date: 2013-01-06 22:49:35 +0000 (Sun, 06 Jan 2013) Log Message: ----------- 1. Changed const char* to const std::string& in the JZConfigurationEntry constructors and removed and extra constructor for a string value. 2. Changed the return value for JZConfigurationEntry::GetValue from const int& to int. 3. Changed the return value for JZConfiguration::GetValue(const char* pName) and JZConfiguration::GetValue(int Index) from const int& to int. 4. Removed c_str() usage. 5. Changed const char* pNoneString to const string NoneString. Modified Paths: -------------- trunk/jazz/src/Configuration.cpp trunk/jazz/src/Configuration.h Modified: trunk/jazz/src/Configuration.cpp =================================================================== --- trunk/jazz/src/Configuration.cpp 2013-01-06 22:40:42 UTC (rev 941) +++ trunk/jazz/src/Configuration.cpp 2013-01-06 22:49:35 UTC (rev 942) @@ -46,66 +46,35 @@ //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- JZConfigurationEntry::JZConfigurationEntry( - const char* pName, + const string& Name, int IntegerValue) : mType(eConfigEntryTypeInt), - mName(), + mName(Name), mValue(IntegerValue), mStringValue() { - if (pName) - { - mName = pName; - } } //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- JZConfigurationEntry::JZConfigurationEntry( - const char* pName, - const char* pStringValue) + const string& Name, + const string& StringValue) : mType(eConfigEntryTypeStr), - mName(), + mName(Name), mValue(0), - mStringValue() + mStringValue(StringValue) { - if (pName) - { - mName = pName; - } - - if (pStringValue) - { - mStringValue = pStringValue; - } } //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- -JZConfigurationEntry::JZConfigurationEntry( - const char* pName, - const string& StringValue) -{ - if (pName) - { - mName = pName; - } - - mStringValue = StringValue; -} - -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- -JZConfigurationEntry::JZConfigurationEntry(const char* pName) +JZConfigurationEntry::JZConfigurationEntry(const string& Name) : mType(eConfigEntryTypeEmpty), - mName(), + mName(Name), mValue(0), mStringValue() { - if (pName) - { - mName = pName; - } } //----------------------------------------------------------------------------- @@ -134,8 +103,6 @@ mNames[i] = 0; } - const char* pNoneString = "None"; - // search for midi device mNames[C_Seq2Device] = new JZConfigurationEntry(".device", -1); @@ -295,12 +262,12 @@ // Default synthesizer type. mNames[C_SynthType] = new JZConfigurationEntry( ".synth_type", - gSynthesizerTypes[SynthTypeGS].first.c_str()); + gSynthesizerTypes[SynthTypeGS].first); // Default synthesizer configuration file. mNames[C_SynthConfig] = new JZConfigurationEntry( ".synth_config", - gSynthesierTypeFiles[SynthTypeGS].first.c_str()); + gSynthesierTypeFiles[SynthTypeGS].first); // When to send synthesizer reset (0 = never, 1 = song start, // 2 = start play). @@ -337,7 +304,9 @@ mDrumNames.push_back(make_pair("", i)); } - mDrumSets.push_back(make_pair(pNoneString, 0)); + const string NoneString = "None"; + + mDrumSets.push_back(make_pair(NoneString, 0)); for (int i = 1; i < 130; ++i) { mDrumSets.push_back(make_pair("", i)); @@ -348,7 +317,7 @@ mControlNames.push_back(make_pair("", i)); } - mVoiceNames.push_back(make_pair(pNoneString, 0)); + mVoiceNames.push_back(make_pair(NoneString, 0)); mVoiceNames.push_back(make_pair("", 0)); } @@ -525,7 +494,7 @@ //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- -const int& JZConfiguration::GetValue(const char* pName) const +int JZConfiguration::GetValue(const char* pName) const { int i = Check(pName); @@ -536,7 +505,7 @@ //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- -const int& JZConfiguration::GetValue(int Index) const +int JZConfiguration::GetValue(int Index) const { assert((Index >= 0) && (Index < NumConfigNames)); return mNames[Index]->GetValue(); Modified: trunk/jazz/src/Configuration.h =================================================================== --- trunk/jazz/src/Configuration.h 2013-01-06 22:40:42 UTC (rev 941) +++ trunk/jazz/src/Configuration.h 2013-01-06 22:49:35 UTC (rev 942) @@ -137,19 +137,19 @@ { public: - JZConfigurationEntry(const char* pName, int IntegerValue); + JZConfigurationEntry(const std::string& Name, int IntegerValue); - JZConfigurationEntry(const char* pName, const char* pStringValue); + JZConfigurationEntry( + const std::string& Name, + const std::string& StringValue); - JZConfigurationEntry(const char* pName, const std::string& StringValue); + JZConfigurationEntry(const std::string& Name); - JZConfigurationEntry(const char* pName); - TEConfigEntryType GetType() const; const std::string& GetName() const; - const int& GetValue() const; + int GetValue() const; void SetValue(const int& Value); @@ -188,7 +188,7 @@ //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- inline -const int& JZConfigurationEntry::GetValue() const +int JZConfigurationEntry::GetValue() const { return mValue; } @@ -236,8 +236,8 @@ const std::string& GetStrValue(int Entry) const; - const int& GetValue(const char* pName) const; - const int& GetValue(int Index) const; + int GetValue(const char* pName) const; + int GetValue(int Index) const; bool Get(int Entry, std::string& Value); bool Get(int Entry, int& Value); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pst...@us...> - 2013-01-06 22:40:44
|
Revision: 941 http://sourceforge.net/p/jazzplusplus/code/941 Author: pstieber Date: 2013-01-06 22:40:42 +0000 (Sun, 06 Jan 2013) Log Message: ----------- 1. Commented out floating-point exception signals for Linux due to an exception being thrown by the scrollbar code in the Ubuntu 12.04 Unity liboveralay-scrollbar code. 2. Changed how wxApp::OnInit is called. Modified Paths: -------------- trunk/jazz/src/JazzPlusPlusApplication.cpp Modified: trunk/jazz/src/JazzPlusPlusApplication.cpp =================================================================== --- trunk/jazz/src/JazzPlusPlusApplication.cpp 2013-01-06 03:13:16 UTC (rev 940) +++ trunk/jazz/src/JazzPlusPlusApplication.cpp 2013-01-06 22:40:42 UTC (rev 941) @@ -106,7 +106,10 @@ // 2. Invalid arguments (for example sqrt of a negative number). // 3. Overflow. // on a Linux box. - feenableexcept(FE_DIVBYZERO | FE_INVALID | FE_OVERFLOW); + + // The scrollbar code in the Ubuntu 12.04 Unity liboveralay-scrollbar code + // is causing floating point exceptions so I'm commenting out this code. +// feenableexcept(FE_DIVBYZERO | FE_INVALID | FE_OVERFLOW); #endif // __LINUX__ } @@ -125,6 +128,12 @@ //----------------------------------------------------------------------------- bool JZJazzPlusPlusApplication::OnInit() { + // Call base class function. This is needed for command line parsing. + if (!wxApp::OnInit()) + { + return false; + } + #if defined(_MSC_VER) && defined(_DEBUG) RedirectIoToConsole(); #endif // _MSC_VER @@ -140,9 +149,6 @@ mpProject = new JZProject; gpProject = mpProject; - // Call base class function. This is needed for command line parsing. - wxApp::OnInit(); - // Create the main application window. mpTrackFrame = JZProjectManager::Instance()->CreateTrackView(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pst...@us...> - 2013-01-06 03:13:20
|
Revision: 940 http://sourceforge.net/p/jazzplusplus/code/940 Author: pstieber Date: 2013-01-06 03:13:16 +0000 (Sun, 06 Jan 2013) Log Message: ----------- Removed unneeded include files. Modified Paths: -------------- trunk/jazz/src/Synth.cpp Modified: trunk/jazz/src/Synth.cpp =================================================================== --- trunk/jazz/src/Synth.cpp 2013-01-06 02:24:37 UTC (rev 939) +++ trunk/jazz/src/Synth.cpp 2013-01-06 03:13:16 UTC (rev 940) @@ -22,14 +22,10 @@ #include "Synth.h" -//#include "eventwin.h" #include "Globals.h" #include "JazzPlusPlusApplication.h" -#include "Player.h" #include "SynthesizerTypeEnums.h" #include "SysexChannel.h" -#include "Track.h" -#include "TrackWindow.h" #include <cassert> #include <cstdlib> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pst...@us...> - 2013-01-06 02:24:41
|
Revision: 939 http://sourceforge.net/p/jazzplusplus/code/939 Author: pstieber Date: 2013-01-06 02:24:37 +0000 (Sun, 06 Jan 2013) Log Message: ----------- Separated the synthesizer type enumerations into their own header. Modified Paths: -------------- trunk/jazz/src/Configuration.cpp trunk/jazz/src/Makefile.am trunk/jazz/src/Project.cpp trunk/jazz/src/Synth.cpp trunk/jazz/src/Synth.h trunk/jazz/vc10/JazzPlusPlus-VC10.vcxproj trunk/jazz/vc10/JazzPlusPlus-VC10.vcxproj.filters trunk/jazz/vc11/JazzPlusPlus-VC11.vcxproj trunk/jazz/vc11/JazzPlusPlus-VC11.vcxproj.filters trunk/jazz/vc9/JazzPlusPlus-VC9.vcproj Added Paths: ----------- trunk/jazz/src/SynthesizerTypeEnums.h Modified: trunk/jazz/src/Configuration.cpp =================================================================== --- trunk/jazz/src/Configuration.cpp 2013-01-05 23:08:20 UTC (rev 938) +++ trunk/jazz/src/Configuration.cpp 2013-01-06 02:24:37 UTC (rev 939) @@ -26,6 +26,7 @@ #include "Globals.h" #include "StringUtilities.h" #include "Synth.h" +#include "SynthesizerTypeEnums.h" #include <wx/filename.h> #include <wx/msgdlg.h> Modified: trunk/jazz/src/Makefile.am =================================================================== --- trunk/jazz/src/Makefile.am 2013-01-05 23:08:20 UTC (rev 938) +++ trunk/jazz/src/Makefile.am 2013-01-06 02:24:37 UTC (rev 939) @@ -307,6 +307,7 @@ StringReadWrite.h \ StringUtilities.h \ Synth.h \ +SynthesizerTypeEnums.h \ SysexChannel.h \ ToolBar.h \ TrackFrame.h \ Modified: trunk/jazz/src/Project.cpp =================================================================== --- trunk/jazz/src/Project.cpp 2013-01-05 23:08:20 UTC (rev 938) +++ trunk/jazz/src/Project.cpp 2013-01-06 02:24:37 UTC (rev 939) @@ -30,6 +30,7 @@ #include "Synth.h" #include "Song.h" #include "StandardFile.h" +#include "SynthesizerTypeEnums.h" #ifdef __WXMSW__ #include "WindowsPlayer.h" @@ -45,11 +46,11 @@ #include "AlsaDriver.h" #endif -#include <wx/stdpaths.h> #include <wx/config.h> #include <wx/file.h> #include <wx/filedlg.h> #include <wx/filename.h> +#include <wx/stdpaths.h> #include <fstream> #include <iostream> Modified: trunk/jazz/src/Synth.cpp =================================================================== --- trunk/jazz/src/Synth.cpp 2013-01-05 23:08:20 UTC (rev 938) +++ trunk/jazz/src/Synth.cpp 2013-01-06 02:24:37 UTC (rev 939) @@ -26,6 +26,7 @@ #include "Globals.h" #include "JazzPlusPlusApplication.h" #include "Player.h" +#include "SynthesizerTypeEnums.h" #include "SysexChannel.h" #include "Track.h" #include "TrackWindow.h" Modified: trunk/jazz/src/Synth.h =================================================================== --- trunk/jazz/src/Synth.h 2013-01-05 23:08:20 UTC (rev 938) +++ trunk/jazz/src/Synth.h 2013-01-06 02:24:37 UTC (rev 939) @@ -30,15 +30,6 @@ #include <vector> #include <string> -enum SynthTypeId -{ - SynthTypeGM = 0, - SynthTypeGS, - SynthTypeXG, - SynthTypeOther, - NumSynthTypes -}; - enum SysexId { SX_NONE = 0, Added: trunk/jazz/src/SynthesizerTypeEnums.h =================================================================== --- trunk/jazz/src/SynthesizerTypeEnums.h (rev 0) +++ trunk/jazz/src/SynthesizerTypeEnums.h 2013-01-06 02:24:37 UTC (rev 939) @@ -0,0 +1,10 @@ +#pragma once + +enum TESynthesizerType +{ + SynthTypeGM = 0, + SynthTypeGS, + SynthTypeXG, + SynthTypeOther, + NumSynthTypes +}; Property changes on: trunk/jazz/src/SynthesizerTypeEnums.h ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Modified: trunk/jazz/vc10/JazzPlusPlus-VC10.vcxproj =================================================================== --- trunk/jazz/vc10/JazzPlusPlus-VC10.vcxproj 2013-01-05 23:08:20 UTC (rev 938) +++ trunk/jazz/vc10/JazzPlusPlus-VC10.vcxproj 2013-01-06 02:24:37 UTC (rev 939) @@ -467,6 +467,7 @@ <ClInclude Include="..\src\StringReadWrite.h" /> <ClInclude Include="..\src\StringUtilities.h" /> <ClInclude Include="..\src\Synth.h" /> + <ClInclude Include="..\src\SynthesizerTypeEnums.h" /> <ClInclude Include="..\src\SysexChannel.h" /> <ClInclude Include="..\src\ToolBar.h" /> <ClInclude Include="..\src\Track.h" /> Modified: trunk/jazz/vc10/JazzPlusPlus-VC10.vcxproj.filters =================================================================== --- trunk/jazz/vc10/JazzPlusPlus-VC10.vcxproj.filters 2013-01-05 23:08:20 UTC (rev 938) +++ trunk/jazz/vc10/JazzPlusPlus-VC10.vcxproj.filters 2013-01-06 02:24:37 UTC (rev 939) @@ -223,6 +223,7 @@ <ClInclude Include="..\src\StringReadWrite.h" /> <ClInclude Include="..\src\StringUtilities.h" /> <ClInclude Include="..\src\Synth.h" /> + <ClInclude Include="..\src\SynthesizerTypeEnums.h" /> <ClInclude Include="..\src\ToolBar.h" /> <ClInclude Include="..\src\Track.h" /> <ClInclude Include="..\src\TrackFrame.h" /> Modified: trunk/jazz/vc11/JazzPlusPlus-VC11.vcxproj =================================================================== --- trunk/jazz/vc11/JazzPlusPlus-VC11.vcxproj 2013-01-05 23:08:20 UTC (rev 938) +++ trunk/jazz/vc11/JazzPlusPlus-VC11.vcxproj 2013-01-06 02:24:37 UTC (rev 939) @@ -470,6 +470,7 @@ <ClInclude Include="..\src\StringReadWrite.h" /> <ClInclude Include="..\src\StringUtilities.h" /> <ClInclude Include="..\src\Synth.h" /> + <ClInclude Include="..\src\SynthesizerTypeEnums.h" /> <ClInclude Include="..\src\SysexChannel.h" /> <ClInclude Include="..\src\ToolBar.h" /> <ClInclude Include="..\src\Track.h" /> Modified: trunk/jazz/vc11/JazzPlusPlus-VC11.vcxproj.filters =================================================================== --- trunk/jazz/vc11/JazzPlusPlus-VC11.vcxproj.filters 2013-01-05 23:08:20 UTC (rev 938) +++ trunk/jazz/vc11/JazzPlusPlus-VC11.vcxproj.filters 2013-01-06 02:24:37 UTC (rev 939) @@ -225,6 +225,7 @@ <ClInclude Include="..\src\StringReadWrite.h" /> <ClInclude Include="..\src\StringUtilities.h" /> <ClInclude Include="..\src\Synth.h" /> + <ClInclude Include="..\src\SynthesizerTypeEnums.h" /> <ClInclude Include="..\src\SysexChannel.h" /> <ClInclude Include="..\src\ToolBar.h" /> <ClInclude Include="..\src\Track.h" /> Modified: trunk/jazz/vc9/JazzPlusPlus-VC9.vcproj =================================================================== --- trunk/jazz/vc9/JazzPlusPlus-VC9.vcproj 2013-01-05 23:08:20 UTC (rev 938) +++ trunk/jazz/vc9/JazzPlusPlus-VC9.vcproj 2013-01-06 02:24:37 UTC (rev 939) @@ -966,6 +966,10 @@ > </File> <File + RelativePath="..\src\SynthesizerTypeEnums.h" + > + </File> + <File RelativePath="..\src\SysexChannel.cpp" > </File> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pst...@us...> - 2013-01-05 23:08:24
|
Revision: 938 http://sourceforge.net/p/jazzplusplus/code/938 Author: pstieber Date: 2013-01-05 23:08:20 +0000 (Sat, 05 Jan 2013) Log Message: ----------- Separated some code into new source modules. Modified Paths: -------------- trunk/jazz/src/Makefile.am trunk/jazz/src/Synth.cpp trunk/jazz/src/Track.cpp trunk/jazz/src/Track.h trunk/jazz/vc10/JazzPlusPlus-VC10.vcxproj trunk/jazz/vc10/JazzPlusPlus-VC10.vcxproj.filters trunk/jazz/vc11/JazzPlusPlus-VC11.vcxproj trunk/jazz/vc11/JazzPlusPlus-VC11.vcxproj.filters trunk/jazz/vc9/JazzPlusPlus-VC9.vcproj Added Paths: ----------- trunk/jazz/src/DrumEnums.h trunk/jazz/src/DrumUtilities.cpp trunk/jazz/src/DrumUtilities.h trunk/jazz/src/SysexChannel.cpp trunk/jazz/src/SysexChannel.h Added: trunk/jazz/src/DrumEnums.h =================================================================== --- trunk/jazz/src/DrumEnums.h (rev 0) +++ trunk/jazz/src/DrumEnums.h 2013-01-05 23:08:20 UTC (rev 938) @@ -0,0 +1,40 @@ +//***************************************************************************** +// The JAZZ++ Midi Sequencer +// +// Copyright (C) 2013 Peter J. Stieber, all rights reserved. +// +// 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. +//***************************************************************************** + +#pragma once + +enum DrumInstrumentParameter +{ + drumPitch = 0x18, + drumTva = 0x1a, + drumPan = 0x1c, + drumReverb = 0x1d, + drumChorus = 0x1e +}; + +enum DrumInstrumentParameterIndex +{ + drumPitchIndex = 0, + drumTvaIndex, + drumPanIndex, + drumReverbIndex, + drumChorusIndex, + numDrumParameters +}; Property changes on: trunk/jazz/src/DrumEnums.h ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: trunk/jazz/src/DrumUtilities.cpp =================================================================== --- trunk/jazz/src/DrumUtilities.cpp (rev 0) +++ trunk/jazz/src/DrumUtilities.cpp 2013-01-05 23:08:20 UTC (rev 938) @@ -0,0 +1,69 @@ +//***************************************************************************** +// The JAZZ++ Midi Sequencer +// +// Copyright (C) 2013 Peter J. Stieber, all rights reserved. +// +// 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 "DrumUtilities.h" + +#include "DrumEnums.h" + +#include <cassert> + +//***************************************************************************** +//***************************************************************************** +int drumParam2Index(int par) +{ + switch (par) + { + case drumPitch: + return(drumPitchIndex); + case drumTva: + return(drumTvaIndex); + case drumPan: + return(drumPanIndex); + case drumReverb: + return(drumReverbIndex); + case drumChorus: + return(drumChorusIndex); + default: + assert(0); + } + return 0; +} + +//***************************************************************************** +//***************************************************************************** +int drumIndex2Param(int index) +{ + switch (index) + { + case drumPitchIndex: + return drumPitch; + case drumTvaIndex: + return drumTva; + case drumPanIndex: + return drumPan; + case drumReverbIndex: + return drumReverb; + case drumChorusIndex: + return drumChorus; + default: + assert(0); + } + return 0; +} Property changes on: trunk/jazz/src/DrumUtilities.cpp ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: trunk/jazz/src/DrumUtilities.h =================================================================== --- trunk/jazz/src/DrumUtilities.h (rev 0) +++ trunk/jazz/src/DrumUtilities.h 2013-01-05 23:08:20 UTC (rev 938) @@ -0,0 +1,24 @@ +//***************************************************************************** +// The JAZZ++ Midi Sequencer +// +// Copyright (C) 2013 Peter J. Stieber, all rights reserved. +// +// 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. +//***************************************************************************** + +#pragma once + +int drumParam2Index(int par); +int drumIndex2Param(int index); Property changes on: trunk/jazz/src/DrumUtilities.h ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Modified: trunk/jazz/src/Makefile.am =================================================================== --- trunk/jazz/src/Makefile.am 2013-01-04 00:21:30 UTC (rev 937) +++ trunk/jazz/src/Makefile.am 2013-01-05 23:08:20 UTC (rev 938) @@ -47,6 +47,7 @@ Dialogs/TransposeDialog.cpp \ Dialogs/VelocityDialog.cpp \ Dialogs.cpp \ +DrumUtilities.cpp \ DynamicArray.cpp \ ErrorMessage.cpp \ Events.cpp \ @@ -100,6 +101,7 @@ StringReadWrite.cpp \ StringUtilities.cpp \ Synth.cpp \ +SysexChannel.cpp \ ToolBar.cpp \ Track.cpp \ TrackFrame.cpp \ @@ -144,6 +146,8 @@ Dialogs/TransposeDialog.cpp \ Dialogs/VelocityDialog.cpp \ Dialogs.cpp \ +DrumEnums.h \ +DrumUtilities.h \ DynamicArray.cpp \ ErrorMessage.cpp \ Events.cpp \ @@ -198,6 +202,7 @@ StringReadWrite.cpp \ StringUtilities.cpp \ Synth.cpp \ +SysexChannel.cpp \ ToolBar.cpp \ Track.cpp \ TrackFrame.cpp \ @@ -302,6 +307,7 @@ StringReadWrite.h \ StringUtilities.h \ Synth.h \ +SysexChannel.h \ ToolBar.h \ TrackFrame.h \ Track.h \ Modified: trunk/jazz/src/Synth.cpp =================================================================== --- trunk/jazz/src/Synth.cpp 2013-01-04 00:21:30 UTC (rev 937) +++ trunk/jazz/src/Synth.cpp 2013-01-05 23:08:20 UTC (rev 938) @@ -22,17 +22,16 @@ #include "Synth.h" +//#include "eventwin.h" +#include "Globals.h" +#include "JazzPlusPlusApplication.h" +#include "Player.h" +#include "SysexChannel.h" #include "Track.h" -#include "Player.h" -#include "JazzPlusPlusApplication.h" -//#include "eventwin.h" #include "TrackWindow.h" -#include "Globals.h" +#include <cassert> #include <cstdlib> - -#include <assert.h> - #include <string> using namespace std; Added: trunk/jazz/src/SysexChannel.cpp =================================================================== --- trunk/jazz/src/SysexChannel.cpp (rev 0) +++ trunk/jazz/src/SysexChannel.cpp 2013-01-05 23:08:20 UTC (rev 938) @@ -0,0 +1,34 @@ +//***************************************************************************** +// The JAZZ++ Midi Sequencer +// +// Copyright (C) 2013 Peter J. Stieber, all rights reserved. +// +// 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 "SysexChannel.h" + +int sysex_channel(int Channel) +{ + if (Channel < 10) + { + return(Channel); + } + else if (Channel == 10) + { + return 0; + } + return Channel - 1; +} Property changes on: trunk/jazz/src/SysexChannel.cpp ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: trunk/jazz/src/SysexChannel.h =================================================================== --- trunk/jazz/src/SysexChannel.h (rev 0) +++ trunk/jazz/src/SysexChannel.h 2013-01-05 23:08:20 UTC (rev 938) @@ -0,0 +1,23 @@ +//***************************************************************************** +// The JAZZ++ Midi Sequencer +// +// Copyright (C) 2013 Peter J. Stieber, all rights reserved. +// +// 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. +//***************************************************************************** + +#pragma once + +int sysex_channel(int Channel); Property changes on: trunk/jazz/src/SysexChannel.h ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Modified: trunk/jazz/src/Track.cpp =================================================================== --- trunk/jazz/src/Track.cpp 2013-01-04 00:21:30 UTC (rev 937) +++ trunk/jazz/src/Track.cpp 2013-01-05 23:08:20 UTC (rev 938) @@ -23,12 +23,14 @@ #include "Track.h" #include "Configuration.h" +#include "DrumUtilities.h" #include "Dialogs/TrackDialog.h" #include "Globals.h" #include "JazzPlusPlusApplication.h" #include "Player.h" #include "Song.h" #include "Synth.h" +#include "SysexChannel.h" #include "TrackWindow.h" #include <cassert> @@ -203,59 +205,6 @@ return msec; } -int sysex_channel(int Channel) -{ - if (Channel < 10) - { - return(Channel); - } - else if (Channel == 10) - { - return 0; - } - return Channel - 1; -} - -int drumParam2Index(int par) -{ - switch (par) - { - case drumPitch: - return(drumPitchIndex); - case drumTva: - return(drumTvaIndex); - case drumPan: - return(drumPanIndex); - case drumReverb: - return(drumReverbIndex); - case drumChorus: - return(drumChorusIndex); - default: - assert(0); - } - return 0; -} - -int drumIndex2Param(int index) -{ - switch (index) - { - case drumPitchIndex: - return drumPitch; - case drumTvaIndex: - return drumTva; - case drumPanIndex: - return drumPan; - case drumReverbIndex: - return drumReverb; - case drumChorusIndex: - return drumChorus; - default: - assert(0); - } - return 0; -} - JZDrumInstrumentParameter::JZDrumInstrumentParameter(JZNrpn *par) : mPitch(par->mLsb.GetControlValue()), mpNext(0) Modified: trunk/jazz/src/Track.h =================================================================== --- trunk/jazz/src/Track.h 2013-01-04 00:21:30 UTC (rev 937) +++ trunk/jazz/src/Track.h 2013-01-05 23:08:20 UTC (rev 938) @@ -23,8 +23,9 @@ #ifndef JZ_TRACK_H #define JZ_TRACK_H +#include "DrumEnums.h" +#include "DynamicArray.h" #include "Events.h" -#include "DynamicArray.h" #include "NamedValue.h" #include <string> @@ -155,8 +156,6 @@ int length, unsigned char* dd); -int sysex_channel(int Channel); - enum ModulationSysexParameter { mspModPitchControl = 0, @@ -284,28 +283,6 @@ mspUseForRhythm = 0x15 }; -enum DrumInstrumentParameter -{ - drumPitch = 0x18, - drumTva = 0x1a, - drumPan = 0x1c, - drumReverb = 0x1d, - drumChorus = 0x1e -}; - -enum DrumInstrumentParameterIndex -{ - drumPitchIndex = 0, - drumTvaIndex, - drumPanIndex, - drumReverbIndex, - drumChorusIndex, - numDrumParameters -}; - -int drumParam2Index(int par); -int drumIndex2Param(int index); - class JZDrumInstrumentParameterList; //***************************************************************************** Modified: trunk/jazz/vc10/JazzPlusPlus-VC10.vcxproj =================================================================== --- trunk/jazz/vc10/JazzPlusPlus-VC10.vcxproj 2013-01-04 00:21:30 UTC (rev 937) +++ trunk/jazz/vc10/JazzPlusPlus-VC10.vcxproj 2013-01-05 23:08:20 UTC (rev 938) @@ -298,6 +298,7 @@ <ClCompile Include="..\src\Dialogs.cpp" /> <ClCompile Include="..\src\Dialogs\AudioSettingsDialog.cpp" /> <ClCompile Include="..\src\Dialogs\SamplesDialog.cpp" /> + <ClCompile Include="..\src\DrumUtilities.cpp" /> <ClCompile Include="..\src\DynamicArray.cpp" /> <ClCompile Include="..\src\ErrorMessage.cpp" /> <ClCompile Include="..\src\EventFrame.cpp" /> @@ -355,6 +356,7 @@ <ClCompile Include="..\src\StringReadWrite.cpp" /> <ClCompile Include="..\src\StringUtilities.cpp" /> <ClCompile Include="..\src\Synth.cpp" /> + <ClCompile Include="..\src\SysexChannel.cpp" /> <ClCompile Include="..\src\ToolBar.cpp" /> <ClCompile Include="..\src\Track.cpp" /> <ClCompile Include="..\src\TrackFrame.cpp" /> @@ -404,6 +406,8 @@ <ClInclude Include="..\src\Dialogs.h" /> <ClInclude Include="..\src\Dialogs\AudioSettingsDialog.h" /> <ClInclude Include="..\src\Dialogs\SamplesDialog.h" /> + <ClInclude Include="..\src\DrumEnums.h" /> + <ClInclude Include="..\src\DrumUtilities.h" /> <ClInclude Include="..\src\DynamicArray.h" /> <ClInclude Include="..\src\ErrorMessage.h" /> <ClInclude Include="..\src\EventFrame.h" /> @@ -463,6 +467,7 @@ <ClInclude Include="..\src\StringReadWrite.h" /> <ClInclude Include="..\src\StringUtilities.h" /> <ClInclude Include="..\src\Synth.h" /> + <ClInclude Include="..\src\SysexChannel.h" /> <ClInclude Include="..\src\ToolBar.h" /> <ClInclude Include="..\src\Track.h" /> <ClInclude Include="..\src\TrackFrame.h" /> Modified: trunk/jazz/vc10/JazzPlusPlus-VC10.vcxproj.filters =================================================================== --- trunk/jazz/vc10/JazzPlusPlus-VC10.vcxproj.filters 2013-01-04 00:21:30 UTC (rev 937) +++ trunk/jazz/vc10/JazzPlusPlus-VC10.vcxproj.filters 2013-01-05 23:08:20 UTC (rev 938) @@ -154,6 +154,8 @@ <ClCompile Include="..\src\Dialogs\QuantizeDialog.cpp"> <Filter>Dialog Source Files</Filter> </ClCompile> + <ClCompile Include="..\src\DrumUtilities.cpp" /> + <ClCompile Include="..\src\SysexChannel.cpp" /> </ItemGroup> <ItemGroup> <ClInclude Include="..\src\AsciiMidiFile.h" /> @@ -310,6 +312,9 @@ <ClInclude Include="..\src\Dialogs\QuantizeDialog.h"> <Filter>Dialog Source Files</Filter> </ClInclude> + <ClInclude Include="..\src\DrumEnums.h" /> + <ClInclude Include="..\src\DrumUtilities.h" /> + <ClInclude Include="..\src\SysexChannel.h" /> </ItemGroup> <ItemGroup> <None Include="..\src\Makefile.am" /> Modified: trunk/jazz/vc11/JazzPlusPlus-VC11.vcxproj =================================================================== --- trunk/jazz/vc11/JazzPlusPlus-VC11.vcxproj 2013-01-04 00:21:30 UTC (rev 937) +++ trunk/jazz/vc11/JazzPlusPlus-VC11.vcxproj 2013-01-05 23:08:20 UTC (rev 938) @@ -301,6 +301,7 @@ <ClCompile Include="..\src\Dialogs.cpp" /> <ClCompile Include="..\src\Dialogs\AudioSettingsDialog.cpp" /> <ClCompile Include="..\src\Dialogs\SamplesDialog.cpp" /> + <ClCompile Include="..\src\DrumUtilities.cpp" /> <ClCompile Include="..\src\DynamicArray.cpp" /> <ClCompile Include="..\src\ErrorMessage.cpp" /> <ClCompile Include="..\src\EventFrame.cpp" /> @@ -358,6 +359,7 @@ <ClCompile Include="..\src\StringReadWrite.cpp" /> <ClCompile Include="..\src\StringUtilities.cpp" /> <ClCompile Include="..\src\Synth.cpp" /> + <ClCompile Include="..\src\SysexChannel.cpp" /> <ClCompile Include="..\src\ToolBar.cpp" /> <ClCompile Include="..\src\Track.cpp" /> <ClCompile Include="..\src\TrackFrame.cpp" /> @@ -407,6 +409,8 @@ <ClInclude Include="..\src\Dialogs.h" /> <ClInclude Include="..\src\Dialogs\AudioSettingsDialog.h" /> <ClInclude Include="..\src\Dialogs\SamplesDialog.h" /> + <ClCompile Include="..\src\DrumEnums.h" /> + <ClCompile Include="..\src\DrumUtilities.h" /> <ClInclude Include="..\src\DynamicArray.h" /> <ClInclude Include="..\src\ErrorMessage.h" /> <ClInclude Include="..\src\EventFrame.h" /> @@ -466,6 +470,7 @@ <ClInclude Include="..\src\StringReadWrite.h" /> <ClInclude Include="..\src\StringUtilities.h" /> <ClInclude Include="..\src\Synth.h" /> + <ClInclude Include="..\src\SysexChannel.h" /> <ClInclude Include="..\src\ToolBar.h" /> <ClInclude Include="..\src\Track.h" /> <ClInclude Include="..\src\TrackFrame.h" /> Modified: trunk/jazz/vc11/JazzPlusPlus-VC11.vcxproj.filters =================================================================== --- trunk/jazz/vc11/JazzPlusPlus-VC11.vcxproj.filters 2013-01-04 00:21:30 UTC (rev 937) +++ trunk/jazz/vc11/JazzPlusPlus-VC11.vcxproj.filters 2013-01-05 23:08:20 UTC (rev 938) @@ -8,6 +8,7 @@ <ClCompile Include="..\src\Configuration.cpp" /> <ClCompile Include="..\src\ControlEdit.cpp" /> <ClCompile Include="..\src\Dialogs.cpp" /> + <ClCompile Include="..\src\DrumUtilities.cpp" /> <ClCompile Include="..\src\DynamicArray.cpp" /> <ClCompile Include="..\src\ErrorMessage.cpp" /> <ClCompile Include="..\src\EventFrame.cpp" /> @@ -65,6 +66,7 @@ <ClCompile Include="..\src\StringReadWrite.cpp" /> <ClCompile Include="..\src\StringUtilities.cpp" /> <ClCompile Include="..\src\Synth.cpp" /> + <ClCompile Include="..\src\SysexChannel.cpp" /> <ClCompile Include="..\src\ToolBar.cpp" /> <ClCompile Include="..\src\Track.cpp" /> <ClCompile Include="..\src\TrackFrame.cpp" /> @@ -162,6 +164,8 @@ <ClInclude Include="..\src\Configuration.h" /> <ClInclude Include="..\src\ControlEdit.h" /> <ClInclude Include="..\src\Dialogs.h" /> + <ClCompile Include="..\src\DrumEnums.h" /> + <ClCompile Include="..\src\DrumUtilities.h" /> <ClInclude Include="..\src\DynamicArray.h" /> <ClInclude Include="..\src\ErrorMessage.h" /> <ClInclude Include="..\src\EventFrame.h" /> @@ -221,6 +225,7 @@ <ClInclude Include="..\src\StringReadWrite.h" /> <ClInclude Include="..\src\StringUtilities.h" /> <ClInclude Include="..\src\Synth.h" /> + <ClInclude Include="..\src\SysexChannel.h" /> <ClInclude Include="..\src\ToolBar.h" /> <ClInclude Include="..\src\Track.h" /> <ClInclude Include="..\src\TrackFrame.h" /> Modified: trunk/jazz/vc9/JazzPlusPlus-VC9.vcproj =================================================================== --- trunk/jazz/vc9/JazzPlusPlus-VC9.vcproj 2013-01-04 00:21:30 UTC (rev 937) +++ trunk/jazz/vc9/JazzPlusPlus-VC9.vcproj 2013-01-05 23:08:20 UTC (rev 938) @@ -474,6 +474,18 @@ > </File> <File + RelativePath="..\src\DrumEnums.h" + > + </File> + <File + RelativePath="..\src\DrumUtilities.cpp" + > + </File> + <File + RelativePath="..\src\DrumUtilities.h" + > + </File> + <File RelativePath="..\src\DynamicArray.cpp" > </File> @@ -954,6 +966,14 @@ > </File> <File + RelativePath="..\src\SysexChannel.cpp" + > + </File> + <File + RelativePath="..\src\SysexChannel.h" + > + </File> + <File RelativePath="..\src\ToolBar.cpp" > </File> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pst...@us...> - 2013-01-04 00:21:32
|
Revision: 937 http://sourceforge.net/p/jazzplusplus/code/937 Author: pstieber Date: 2013-01-04 00:21:30 +0000 (Fri, 04 Jan 2013) Log Message: ----------- Added AC_LANG_SOURCE and extra square brackets to satisfy autoreconf. Modified Paths: -------------- trunk/jazz/configure.ac Modified: trunk/jazz/configure.ac =================================================================== --- trunk/jazz/configure.ac 2013-01-04 00:06:16 UTC (rev 936) +++ trunk/jazz/configure.ac 2013-01-04 00:21:30 UTC (rev 937) @@ -62,9 +62,9 @@ dnl ints and std::_Ios_Openmode interchangeably. There's probably a simpler dnl autoconf technique for checking this feature. AC_MSG_CHECKING(for _Ios_Openmode) -AC_COMPILE_IFELSE( -[#include <iostream> -std::_Ios_Openmode test;], +AC_COMPILE_IFELSE([AC_LANG_SOURCE( +[[#include <iostream> +std::_Ios_Openmode test;]])], result=yes, result=no) if test $result = yes; then This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pst...@us...> - 2013-01-04 00:06:19
|
Revision: 936 http://sourceforge.net/p/jazzplusplus/code/936 Author: pstieber Date: 2013-01-04 00:06:16 +0000 (Fri, 04 Jan 2013) Log Message: ----------- Removed a directory that is added by autoreconf. Removed Paths: ------------- trunk/jazz/config/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pst...@us...> - 2013-01-04 00:02:28
|
Revision: 935 http://sourceforge.net/p/jazzplusplus/code/935 Author: pstieber Date: 2013-01-04 00:02:25 +0000 (Fri, 04 Jan 2013) Log Message: ----------- Updated the required wxWidgets version to 2.9.4. Modified Paths: -------------- trunk/jazz/configure.ac Modified: trunk/jazz/configure.ac =================================================================== --- trunk/jazz/configure.ac 2013-01-03 23:51:45 UTC (rev 934) +++ trunk/jazz/configure.ac 2013-01-04 00:02:25 UTC (rev 935) @@ -166,7 +166,7 @@ dnl Check for wxWidgets AM_OPTIONS_WXCONFIG -MIN_WX_VERSION="2.8.9" +MIN_WX_VERSION="2.9.4" AM_PATH_WXCONFIG( $MIN_WX_VERSION, [WX_FOUND=1], This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pst...@us...> - 2013-01-03 23:51:48
|
Revision: 934 http://sourceforge.net/p/jazzplusplus/code/934 Author: pstieber Date: 2013-01-03 23:51:45 +0000 (Thu, 03 Jan 2013) Log Message: ----------- Added includes of wx/wxcrtvararg.h for wxWidgets 2.9.* compatibility. Modified Paths: -------------- trunk/jazz/src/DeprecatedWx/prop.cpp trunk/jazz/src/DeprecatedWx/propform.cpp trunk/jazz/src/DeprecatedWx/proplist.cpp Modified: trunk/jazz/src/DeprecatedWx/prop.cpp =================================================================== --- trunk/jazz/src/DeprecatedWx/prop.cpp 2013-01-02 18:21:30 UTC (rev 933) +++ trunk/jazz/src/DeprecatedWx/prop.cpp 2013-01-03 23:51:45 UTC (rev 934) @@ -24,6 +24,7 @@ #endif #include "wx/debug.h" +#include "wx/wxcrtvararg.h" #include "prop.h" #include <ctype.h> Modified: trunk/jazz/src/DeprecatedWx/propform.cpp =================================================================== --- trunk/jazz/src/DeprecatedWx/propform.cpp 2013-01-02 18:21:30 UTC (rev 933) +++ trunk/jazz/src/DeprecatedWx/propform.cpp 2013-01-03 23:51:45 UTC (rev 934) @@ -21,6 +21,7 @@ #if wxUSE_PROPSHEET #ifndef WX_PRECOMP + #include "wx/wxcrtvararg.h" #include "wx/choice.h" #include "wx/checkbox.h" #include "wx/slider.h" Modified: trunk/jazz/src/DeprecatedWx/proplist.cpp =================================================================== --- trunk/jazz/src/DeprecatedWx/proplist.cpp 2013-01-02 18:21:30 UTC (rev 933) +++ trunk/jazz/src/DeprecatedWx/proplist.cpp 2013-01-03 23:51:45 UTC (rev 934) @@ -38,6 +38,7 @@ #include "wx/settings.h" #include "wx/msgdlg.h" #include "wx/filedlg.h" + #include "wx/wxcrtvararg.h" #endif #include "wx/sizer.h" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pst...@us...> - 2013-01-02 18:21:33
|
Revision: 933 http://sourceforge.net/p/jazzplusplus/code/933 Author: pstieber Date: 2013-01-02 18:21:30 +0000 (Wed, 02 Jan 2013) Log Message: ----------- Explicitly converted C strings to wxString values. Modified Paths: -------------- trunk/jazz/src/Project.cpp Modified: trunk/jazz/src/Project.cpp =================================================================== --- trunk/jazz/src/Project.cpp 2013-01-02 18:19:09 UTC (rev 932) +++ trunk/jazz/src/Project.cpp 2013-01-02 18:21:30 UTC (rev 933) @@ -432,9 +432,9 @@ wxFileDialog OpenDialog( 0, DialogTitle, - "", + wxString(""), mConfFileName, - "*.cfg", + wxString("*.cfg"), wxFD_OPEN); if (OpenDialog.ShowModal() == wxID_OK) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pst...@us...> - 2013-01-02 18:19:12
|
Revision: 932 http://sourceforge.net/p/jazzplusplus/code/932 Author: pstieber Date: 2013-01-02 18:19:09 +0000 (Wed, 02 Jan 2013) Log Message: ----------- Added --install. Modified Paths: -------------- trunk/jazz/bootstrap Modified: trunk/jazz/bootstrap =================================================================== --- trunk/jazz/bootstrap 2013-01-02 18:10:01 UTC (rev 931) +++ trunk/jazz/bootstrap 2013-01-02 18:19:09 UTC (rev 932) @@ -1,2 +1,2 @@ #! /bin/sh -autoreconf --verbose +autoreconf --install --verbose This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pst...@us...> - 2013-01-02 18:10:05
|
Revision: 931 http://sourceforge.net/p/jazzplusplus/code/931 Author: pstieber Date: 2013-01-02 18:10:01 +0000 (Wed, 02 Jan 2013) Log Message: ----------- Added a codeblocks project and corresponding config.h for Linux. Added Paths: ----------- trunk/jazz/codeblocks/ trunk/jazz/codeblocks/Jazz++.cbp trunk/jazz/codeblocks/config.h Added: trunk/jazz/codeblocks/Jazz++.cbp =================================================================== --- trunk/jazz/codeblocks/Jazz++.cbp (rev 0) +++ trunk/jazz/codeblocks/Jazz++.cbp 2013-01-02 18:10:01 UTC (rev 931) @@ -0,0 +1,250 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes" ?> +<CodeBlocks_project_file> + <FileVersion major="1" minor="6" /> + <Project> + <Option title="Jazz++" /> + <Option pch_mode="2" /> + <Option compiler="gcc" /> + <Build> + <Target title="Debug GCC"> + <Option output="bin/Debug GCC/Jazz++" prefix_auto="1" extension_auto="1" /> + <Option object_output="obj/Debug GCC/" /> + <Option type="0" /> + <Option compiler="gcc" /> + <Option projectLinkerOptionsRelation="2" /> + <Compiler> + <Add option="-g" /> + <Add directory="/home/pstieber/OutsideSource/jazzplusplus/jazz/codeblocks/" /> + </Compiler> + <Linker> + <Add library="asound" /> + </Linker> + </Target> + <Target title="Release GCC"> + <Option output="bin/Release GCC/Jazz++" prefix_auto="1" extension_auto="1" /> + <Option object_output="obj/Release GCC/" /> + <Option type="0" /> + <Option compiler="gcc" /> + <Option projectLinkerOptionsRelation="2" /> + <Compiler> + <Add option="-O2" /> + <Add directory="/home/pstieber/OutsideSource/jazzplusplus/jazz/codeblocks/" /> + </Compiler> + <Linker> + <Add option="-s" /> + <Add library="asound" /> + </Linker> + </Target> + </Build> + <Compiler> + <Add option="`wx-config --cflags`" /> + <Add option="-Wall" /> + </Compiler> + <Linker> + <Add option="`wx-config --libs`" /> + </Linker> + <Unit filename="../src/AboutDialog.cpp" /> + <Unit filename="../src/AboutDialog.h" /> + <Unit filename="../src/AlsaDriver.cpp" /> + <Unit filename="../src/AlsaDriver.h" /> + <Unit filename="../src/AlsaPlayer.cpp" /> + <Unit filename="../src/AlsaPlayer.h" /> + <Unit filename="../src/AlsaThru.cpp" /> + <Unit filename="../src/AlsaThru.h" /> + <Unit filename="../src/AsciiMidiFile.cpp" /> + <Unit filename="../src/AsciiMidiFile.h" /> + <Unit filename="../src/Audio.cpp" /> + <Unit filename="../src/Audio.h" /> + <Unit filename="../src/AudioDriver.cpp" /> + <Unit filename="../src/AudioDriver.h" /> + <Unit filename="../src/Command.cpp" /> + <Unit filename="../src/Command.h" /> + <Unit filename="../src/CommandUtilities.h" /> + <Unit filename="../src/Configuration.cpp" /> + <Unit filename="../src/Configuration.h" /> + <Unit filename="../src/ControlEdit.cpp" /> + <Unit filename="../src/ControlEdit.h" /> + <Unit filename="../src/DeprecatedWx/prop.cpp" /> + <Unit filename="../src/DeprecatedWx/prop.h" /> + <Unit filename="../src/DeprecatedWx/propform.cpp" /> + <Unit filename="../src/DeprecatedWx/propform.h" /> + <Unit filename="../src/DeprecatedWx/proplist.cpp" /> + <Unit filename="../src/DeprecatedWx/proplist.h" /> + <Unit filename="../src/DeprecatedWx/setup.h" /> + <Unit filename="../src/Dialogs.cpp" /> + <Unit filename="../src/Dialogs.h" /> + <Unit filename="../src/Dialogs/AudioSettingsDialog.cpp" /> + <Unit filename="../src/Dialogs/AudioSettingsDialog.h" /> + <Unit filename="../src/Dialogs/CleanupDialog.cpp" /> + <Unit filename="../src/Dialogs/CleanupDialog.h" /> + <Unit filename="../src/Dialogs/ControllerDialog.cpp" /> + <Unit filename="../src/Dialogs/ControllerDialog.h" /> + <Unit filename="../src/Dialogs/DeleteDialog.cpp" /> + <Unit filename="../src/Dialogs/DeleteDialog.h" /> + <Unit filename="../src/Dialogs/EndOfTrackDialog.cpp" /> + <Unit filename="../src/Dialogs/EndOfTrackDialog.h" /> + <Unit filename="../src/Dialogs/FilterDialog.cpp" /> + <Unit filename="../src/Dialogs/FilterDialog.h" /> + <Unit filename="../src/Dialogs/IntegerEdit.cpp" /> + <Unit filename="../src/Dialogs/IntegerEdit.h" /> + <Unit filename="../src/Dialogs/KeyOnDialog.cpp" /> + <Unit filename="../src/Dialogs/KeyOnDialog.h" /> + <Unit filename="../src/Dialogs/LengthDialog.cpp" /> + <Unit filename="../src/Dialogs/LengthDialog.h" /> + <Unit filename="../src/Dialogs/MeterChangeDialog.cpp" /> + <Unit filename="../src/Dialogs/MeterChangeDialog.h" /> + <Unit filename="../src/Dialogs/MetronomeSettingsDialog.cpp" /> + <Unit filename="../src/Dialogs/MetronomeSettingsDialog.h" /> + <Unit filename="../src/Dialogs/MidiChannelDialog.cpp" /> + <Unit filename="../src/Dialogs/MidiChannelDialog.h" /> + <Unit filename="../src/Dialogs/PitchWheelDialog.cpp" /> + <Unit filename="../src/Dialogs/PitchWheelDialog.h" /> + <Unit filename="../src/Dialogs/ProgramChangeDialog.cpp" /> + <Unit filename="../src/Dialogs/ProgramChangeDialog.h" /> + <Unit filename="../src/Dialogs/QuantizeDialog.cpp" /> + <Unit filename="../src/Dialogs/QuantizeDialog.h" /> + <Unit filename="../src/Dialogs/SamplesDialog.cpp" /> + <Unit filename="../src/Dialogs/SamplesDialog.h" /> + <Unit filename="../src/Dialogs/SearchAndReplaceDialog.cpp" /> + <Unit filename="../src/Dialogs/SearchAndReplaceDialog.h" /> + <Unit filename="../src/Dialogs/SetTempoDialog.cpp" /> + <Unit filename="../src/Dialogs/SetTempoDialog.h" /> + <Unit filename="../src/Dialogs/ShiftDialog.cpp" /> + <Unit filename="../src/Dialogs/ShiftDialog.h" /> + <Unit filename="../src/Dialogs/SnapDialog.cpp" /> + <Unit filename="../src/Dialogs/SnapDialog.h" /> + <Unit filename="../src/Dialogs/SynthesizerSettingsDialog.cpp" /> + <Unit filename="../src/Dialogs/SynthesizerSettingsDialog.h" /> + <Unit filename="../src/Dialogs/SysexDialog.cpp" /> + <Unit filename="../src/Dialogs/SysexDialog.h" /> + <Unit filename="../src/Dialogs/TextDialog.cpp" /> + <Unit filename="../src/Dialogs/TextDialog.h" /> + <Unit filename="../src/Dialogs/TrackDialog.cpp" /> + <Unit filename="../src/Dialogs/TrackDialog.h" /> + <Unit filename="../src/Dialogs/TransposeDialog.cpp" /> + <Unit filename="../src/Dialogs/TransposeDialog.h" /> + <Unit filename="../src/Dialogs/VelocityDialog.cpp" /> + <Unit filename="../src/Dialogs/VelocityDialog.h" /> + <Unit filename="../src/DynamicArray.cpp" /> + <Unit filename="../src/DynamicArray.h" /> + <Unit filename="../src/ErrorMessage.cpp" /> + <Unit filename="../src/ErrorMessage.h" /> + <Unit filename="../src/EventFrame.cpp" /> + <Unit filename="../src/EventFrame.h" /> + <Unit filename="../src/EventWindow.cpp" /> + <Unit filename="../src/EventWindow.h" /> + <Unit filename="../src/Events.cpp" /> + <Unit filename="../src/Events.h" /> + <Unit filename="../src/FileSelector.cpp" /> + <Unit filename="../src/FileSelector.h" /> + <Unit filename="../src/Filter.cpp" /> + <Unit filename="../src/Filter.h" /> + <Unit filename="../src/FindFile.cpp" /> + <Unit filename="../src/FindFile.h" /> + <Unit filename="../src/FrequencyTable.cpp" /> + <Unit filename="../src/FrequencyTable.h" /> + <Unit filename="../src/GetOptionIndex.cpp" /> + <Unit filename="../src/GetOptionIndex.h" /> + <Unit filename="../src/Globals.cpp" /> + <Unit filename="../src/Globals.h" /> + <Unit filename="../src/GuitarFrame.cpp" /> + <Unit filename="../src/GuitarFrame.h" /> + <Unit filename="../src/GuitarSettings.cpp" /> + <Unit filename="../src/GuitarSettings.h" /> + <Unit filename="../src/GuitarSettingsDialog.cpp" /> + <Unit filename="../src/GuitarSettingsDialog.h" /> + <Unit filename="../src/GuitarWindow.cpp" /> + <Unit filename="../src/GuitarWindow.h" /> + <Unit filename="../src/Harmony.cpp" /> + <Unit filename="../src/Harmony.h" /> + <Unit filename="../src/HarmonyBrowserAnalyzer.cpp" /> + <Unit filename="../src/HarmonyBrowserAnalyzer.h" /> + <Unit filename="../src/HarmonyP.cpp" /> + <Unit filename="../src/HarmonyP.h" /> + <Unit filename="../src/Help.cpp" /> + <Unit filename="../src/Help.h" /> + <Unit filename="../src/JazzPlusPlusApplication.cpp" /> + <Unit filename="../src/JazzPlusPlusApplication.h" /> + <Unit filename="../src/KeyStringConverters.cpp" /> + <Unit filename="../src/KeyStringConverters.h" /> + <Unit filename="../src/Knob.cpp" /> + <Unit filename="../src/Knob.h" /> + <Unit filename="../src/Mapper.cpp" /> + <Unit filename="../src/Mapper.h" /> + <Unit filename="../src/MeasureChoice.cpp" /> + <Unit filename="../src/MeasureChoice.h" /> + <Unit filename="../src/Metronome.cpp" /> + <Unit filename="../src/Metronome.h" /> + <Unit filename="../src/MidiDeviceDialog.cpp" /> + <Unit filename="../src/MidiDeviceDialog.h" /> + <Unit filename="../src/MouseAction.cpp" /> + <Unit filename="../src/MouseAction.h" /> + <Unit filename="../src/NamedChoice.cpp" /> + <Unit filename="../src/NamedChoice.h" /> + <Unit filename="../src/NamedValue.cpp" /> + <Unit filename="../src/NamedValue.h" /> + <Unit filename="../src/NamedValueChoice.cpp" /> + <Unit filename="../src/NamedValueChoice.h" /> + <Unit filename="../src/PianoFrame.cpp" /> + <Unit filename="../src/PianoFrame.h" /> + <Unit filename="../src/PianoWindow.cpp" /> + <Unit filename="../src/PianoWindow.h" /> + <Unit filename="../src/Player.cpp" /> + <Unit filename="../src/Player.h" /> + <Unit filename="../src/Project.cpp" /> + <Unit filename="../src/Project.h" /> + <Unit filename="../src/ProjectManager.cpp" /> + <Unit filename="../src/ProjectManager.h" /> + <Unit filename="../src/PropertyListDialog.cpp" /> + <Unit filename="../src/PropertyListDialog.h" /> + <Unit filename="../src/Random.cpp" /> + <Unit filename="../src/Random.h" /> + <Unit filename="../src/RecordingInfo.cpp" /> + <Unit filename="../src/RecordingInfo.h" /> + <Unit filename="../src/Rectangle.cpp" /> + <Unit filename="../src/Rectangle.h" /> + <Unit filename="../src/Resources.h" /> + <Unit filename="../src/Rhythm.cpp" /> + <Unit filename="../src/Rhythm.h" /> + <Unit filename="../src/Sample.cpp" /> + <Unit filename="../src/Sample.h" /> + <Unit filename="../src/SampleCommand.cpp" /> + <Unit filename="../src/SampleCommand.h" /> + <Unit filename="../src/SampleDialog.cpp" /> + <Unit filename="../src/SampleDialog.h" /> + <Unit filename="../src/SampleFrame.cpp" /> + <Unit filename="../src/SampleFrame.h" /> + <Unit filename="../src/SampleWindow.cpp" /> + <Unit filename="../src/SampleWindow.h" /> + <Unit filename="../src/SelectControllerDialog.cpp" /> + <Unit filename="../src/SelectControllerDialog.h" /> + <Unit filename="../src/Signal2.cpp" /> + <Unit filename="../src/Signal2.h" /> + <Unit filename="../src/SliderWindow.cpp" /> + <Unit filename="../src/SliderWindow.h" /> + <Unit filename="../src/Song.cpp" /> + <Unit filename="../src/Song.h" /> + <Unit filename="../src/StandardFile.cpp" /> + <Unit filename="../src/StandardFile.h" /> + <Unit filename="../src/StringReadWrite.cpp" /> + <Unit filename="../src/StringReadWrite.h" /> + <Unit filename="../src/StringUtilities.cpp" /> + <Unit filename="../src/StringUtilities.h" /> + <Unit filename="../src/Synth.cpp" /> + <Unit filename="../src/Synth.h" /> + <Unit filename="../src/ToolBar.cpp" /> + <Unit filename="../src/ToolBar.h" /> + <Unit filename="../src/Track.cpp" /> + <Unit filename="../src/Track.h" /> + <Unit filename="../src/TrackFrame.cpp" /> + <Unit filename="../src/TrackFrame.h" /> + <Unit filename="../src/TrackWindow.cpp" /> + <Unit filename="../src/TrackWindow.h" /> + <Extensions> + <envvars /> + <code_completion /> + <lib_finder disable_auto="1" /> + <debugger /> + </Extensions> + </Project> +</CodeBlocks_project_file> Added: trunk/jazz/codeblocks/config.h =================================================================== --- trunk/jazz/codeblocks/config.h (rev 0) +++ trunk/jazz/codeblocks/config.h 2013-01-02 18:10:01 UTC (rev 931) @@ -0,0 +1,3 @@ +#pragma once + +#define DEV_SEQUENCER2 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pst...@us...> - 2013-01-02 17:41:10
|
Revision: 930 http://sourceforge.net/p/jazzplusplus/code/930 Author: pstieber Date: 2013-01-02 17:41:07 +0000 (Wed, 02 Jan 2013) Log Message: ----------- 1. Updated a call to the wxPanel constructor. 2. Commented out an unused variable. Modified Paths: -------------- trunk/jazz/src/SliderWindow.cpp Modified: trunk/jazz/src/SliderWindow.cpp =================================================================== --- trunk/jazz/src/SliderWindow.cpp 2013-01-02 17:38:59 UTC (rev 929) +++ trunk/jazz/src/SliderWindow.cpp 2013-01-02 17:41:07 UTC (rev 930) @@ -45,7 +45,7 @@ in_constructor = true; n_sliders = 0; sliders_per_row = 1; - panel = new wxPanel(this, 0, 0, 1000, 1000); + panel = new wxPanel(this, wxID_ANY, wxPoint(0, 0), wxSize(1000, 1000)); if (tdefs != NULL) mpToolBar=new JZToolBar(this, tdefs); @@ -93,7 +93,7 @@ void JZSliderWindow::OnSize(wxSizeEvent& Event) { cout <<"JZSliderWindow::OnSize "<<in_constructor<<endl; - wxSize sz = Event.GetSize(); +// wxSize sz = Event.GetSize(); if (in_constructor) { @@ -148,7 +148,6 @@ return true; } - void JZSliderWindow::AddItems() { #ifdef OBSOLETE This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pst...@us...> - 2013-01-02 17:39:02
|
Revision: 929 http://sourceforge.net/p/jazzplusplus/code/929 Author: pstieber Date: 2013-01-02 17:38:59 +0000 (Wed, 02 Jan 2013) Log Message: ----------- Removed an unused variable (k) and simplified code. Modified Paths: -------------- trunk/jazz/src/SampleDialog.cpp Modified: trunk/jazz/src/SampleDialog.cpp =================================================================== --- trunk/jazz/src/SampleDialog.cpp 2013-01-02 17:30:00 UTC (rev 928) +++ trunk/jazz/src/SampleDialog.cpp 2013-01-02 17:38:59 UTC (rev 929) @@ -710,11 +710,9 @@ // und: klar, toolbar } - void JZSynthDlg::AddEdits() { - int i, k; - for (i = 0, k = 0; i < MAXSYNTHS; i++) + for (int i = 0; i < MAXSYNTHS; i++) { synths[i] = new JZAddSynth(this); synths[i]->SetDuration(duration); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pst...@us...> - 2013-01-02 17:30:04
|
Revision: 928 http://sourceforge.net/p/jazzplusplus/code/928 Author: pstieber Date: 2013-01-02 17:30:00 +0000 (Wed, 02 Jan 2013) Log Message: ----------- Commented out unused variables. Modified Paths: -------------- trunk/jazz/src/PianoWindow.cpp Modified: trunk/jazz/src/PianoWindow.cpp =================================================================== --- trunk/jazz/src/PianoWindow.cpp 2013-01-02 17:07:59 UTC (rev 927) +++ trunk/jazz/src/PianoWindow.cpp 2013-01-02 17:30:00 UTC (rev 928) @@ -1536,8 +1536,8 @@ // Coordinate lines. - int x0 = Clock2x(0); - int y0 = TrackIndex2y(64); +// int x0 = Clock2x(0); +// int y0 = TrackIndex2y(64); while (pEvent) { @@ -1649,8 +1649,8 @@ } } - x0 = x1; - y0 = y1; +// x0 = x1; +// y0 = y1; if (Clock > mToClock) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pst...@us...> - 2013-01-02 17:08:02
|
Revision: 927 http://sourceforge.net/p/jazzplusplus/code/927 Author: pstieber Date: 2013-01-02 17:07:59 +0000 (Wed, 02 Jan 2013) Log Message: ----------- Updated the interface to the control panel. Modified Paths: -------------- trunk/jazz/src/ControlEdit.cpp trunk/jazz/src/ControlEdit.h Modified: trunk/jazz/src/ControlEdit.cpp =================================================================== --- trunk/jazz/src/ControlEdit.cpp 2012-12-21 17:12:57 UTC (rev 926) +++ trunk/jazz/src/ControlEdit.cpp 2013-01-02 17:07:59 UTC (rev 927) @@ -70,7 +70,7 @@ clocks_per_pixel = 0; sticky = 1; - panel = new JZControlPanel(this, mpPianoWindow, x, y, dx, h, 0, "Controller Edit"); + panel = new JZControlPanel(this, mpPianoWindow, wxPoint(x, y), wxSize(dx, h), 0, "Controller Edit"); //(void) new wxMessage(panel, (char *)label); //panel->NewLine(); Modified: trunk/jazz/src/ControlEdit.h =================================================================== --- trunk/jazz/src/ControlEdit.h 2012-12-21 17:12:57 UTC (rev 926) +++ trunk/jazz/src/ControlEdit.h 2013-01-02 17:07:59 UTC (rev 927) @@ -44,13 +44,11 @@ JZControlPanel( JZCtrlEditBase* e, wxWindow* pParent, - int x=-1, - int y=-1, - int width=-1, - int height=-1, + const wxPoint& Position = wxDefaultPosition, + const wxSize& Size = wxDefaultSize, long style=0, const char* pName = "panel") - : wxPanel(pParent, x, y, width, height, style, pName) + : wxPanel(pParent, wxID_ANY, Position, Size, style, pName) { edit = e; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pst...@us...> - 2012-12-21 17:13:00
|
Revision: 926 http://sourceforge.net/p/jazzplusplus/code/926 Author: pstieber Date: 2012-12-21 17:12:57 +0000 (Fri, 21 Dec 2012) Log Message: ----------- Added a std:: qualifier to size_t. Modified Paths: -------------- trunk/jazz/src/FrequencyTable.h Modified: trunk/jazz/src/FrequencyTable.h =================================================================== --- trunk/jazz/src/FrequencyTable.h 2012-12-21 16:56:55 UTC (rev 925) +++ trunk/jazz/src/FrequencyTable.h 2012-12-21 17:12:57 UTC (rev 926) @@ -33,7 +33,7 @@ JZFrequencyTable(); - size_t GetKey(double Frequency); + std::size_t GetKey(double Frequency); double GetFrequency(int Key) const { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pst...@us...> - 2012-12-21 16:56:58
|
Revision: 925 http://sourceforge.net/p/jazzplusplus/code/925 Author: pstieber Date: 2012-12-21 16:56:55 +0000 (Fri, 21 Dec 2012) Log Message: ----------- Update wx_str to mb_str. Modified Paths: -------------- trunk/jazz/src/Audio.cpp trunk/jazz/src/Configuration.cpp trunk/jazz/src/Harmony.cpp trunk/jazz/src/JazzPlusPlusApplication.cpp trunk/jazz/src/Rhythm.cpp trunk/jazz/src/SampleDialog.cpp Modified: trunk/jazz/src/Audio.cpp =================================================================== --- trunk/jazz/src/Audio.cpp 2012-11-30 15:53:45 UTC (rev 924) +++ trunk/jazz/src/Audio.cpp 2012-12-21 16:56:55 UTC (rev 925) @@ -289,7 +289,7 @@ // Get the path of the sample file. wxString SplFilePath = ::wxPathOnly(FileName); - ifstream Is(FileName.wx_str()); + ifstream Is(FileName.mb_str()); int Version; Is >> Version >> mSamplingRate >> mChannelCount >> mSoftwareSynchonization; while (Is && !Is.eof()) @@ -364,7 +364,7 @@ //----------------------------------------------------------------------------- int JZSampleSet::Save(const wxString& FileName) { - ofstream Ofs(FileName.wx_str()); + ofstream Ofs(FileName.mb_str()); Ofs << 1 << ' ' << mSamplingRate @@ -1060,7 +1060,7 @@ wh.data_length = (end_index - start_index) * sizeof(short); wh.length = wh.data_length + sizeof(WaveHeader); - ofstream os(FileName.wx_str(), ios::out | ios::binary | ios::trunc); + ofstream os(FileName.mb_str(), ios::out | ios::binary | ios::trunc); os.write((char*)&wh, sizeof(wh)); Modified: trunk/jazz/src/Configuration.cpp =================================================================== --- trunk/jazz/src/Configuration.cpp 2012-11-30 15:53:45 UTC (rev 924) +++ trunk/jazz/src/Configuration.cpp 2012-12-21 16:56:55 UTC (rev 925) @@ -553,7 +553,7 @@ return false; } - ifstream Ifs(FileName.wx_str()); + ifstream Ifs(FileName.mb_str()); if (!Ifs) { return false; @@ -642,7 +642,7 @@ return false; } - ifstream Ifs(FileName.wx_str()); + ifstream Ifs(FileName.mb_str()); if (!Ifs) { return false; @@ -734,7 +734,7 @@ << " \"" << mFileName << '"' << endl; - ifstream* pIs = new ifstream(mFileName.wx_str()); + ifstream* pIs = new ifstream(mFileName.mb_str()); InputFileStreams.push(pIs); if (!*InputFileStreams.top()) @@ -848,7 +848,7 @@ } else { - pIs = new ifstream(IncludeFileName.wx_str()); + pIs = new ifstream(IncludeFileName.mb_str()); InputFileStreams.push(pIs); } Modified: trunk/jazz/src/Harmony.cpp =================================================================== --- trunk/jazz/src/Harmony.cpp 2012-11-30 15:53:45 UTC (rev 924) +++ trunk/jazz/src/Harmony.cpp 2012-12-21 16:56:55 UTC (rev 925) @@ -1449,7 +1449,7 @@ if (!FileName.empty()) { - ifstream Is(FileName.wx_str()); + ifstream Is(FileName.mb_str()); Is >> *this; } } @@ -1467,7 +1467,7 @@ if (!FileName.empty()) { - ofstream os(FileName.wx_str()); + ofstream os(FileName.mb_str()); os << *this; } } Modified: trunk/jazz/src/JazzPlusPlusApplication.cpp =================================================================== --- trunk/jazz/src/JazzPlusPlusApplication.cpp 2012-11-30 15:53:45 UTC (rev 924) +++ trunk/jazz/src/JazzPlusPlusApplication.cpp 2012-12-21 16:56:55 UTC (rev 925) @@ -191,7 +191,7 @@ // Test for the existence of the help file. bool HelpFileFound = false; ifstream Is; - Is.open(HelpFileNameAndPath.wx_str()); + Is.open(HelpFileNameAndPath.mb_str()); if (!Is) { // Ask the user to find the help file. @@ -202,7 +202,7 @@ // Try one more time. Is.close(); Is.clear(); - Is.open(HelpFileNameAndPath.wx_str()); + Is.open(HelpFileNameAndPath.mb_str()); if (!Is) { wxString Message = "Failed to add the Jazz++ book " + mHelpFileName; Modified: trunk/jazz/src/Rhythm.cpp =================================================================== --- trunk/jazz/src/Rhythm.cpp 2012-11-30 15:53:45 UTC (rev 924) +++ trunk/jazz/src/Rhythm.cpp 2012-12-21 16:56:55 UTC (rev 925) @@ -769,7 +769,7 @@ "*.rhy"); if (!FileName.empty()) { - ifstream Is(FileName.wx_str()); + ifstream Is(FileName.mb_str()); Is >> *this; OnPaint(); } @@ -787,7 +787,7 @@ "*.rhy"); if (!FileName.empty()) { - ofstream Os(FileName.wx_str()); + ofstream Os(FileName.mb_str()); Os << *this; } } Modified: trunk/jazz/src/SampleDialog.cpp =================================================================== --- trunk/jazz/src/SampleDialog.cpp 2012-11-30 15:53:45 UTC (rev 924) +++ trunk/jazz/src/SampleDialog.cpp 2012-12-21 16:56:55 UTC (rev 925) @@ -626,7 +626,7 @@ "*.syn"); if (!FileName.empty()) { - ifstream is(FileName.wx_str()); + ifstream is(FileName.mb_str()); is >> *this; SetupEdits(); int cw, ch; @@ -648,7 +648,7 @@ "*.syn"); if (!FileName.empty()) { - ofstream os(FileName.wx_str()); + ofstream os(FileName.mb_str()); os << *this; } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pst...@us...> - 2012-11-30 15:53:53
|
Revision: 924 http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=924&view=rev Author: pstieber Date: 2012-11-30 15:53:45 +0000 (Fri, 30 Nov 2012) Log Message: ----------- Added VS 2012 project, solution and filter files. Added Paths: ----------- trunk/jazz/portmidi/pm_win/portmidi-VC11.vcxproj trunk/jazz/portmidi/porttime/porttime-VC11.vcxproj trunk/jazz/vc11/JazzPlusPlus-VC11.sln trunk/jazz/vc11/JazzPlusPlus-VC11.vcxproj trunk/jazz/vc11/JazzPlusPlus-VC11.vcxproj.filters Added: trunk/jazz/portmidi/pm_win/portmidi-VC11.vcxproj =================================================================== --- trunk/jazz/portmidi/pm_win/portmidi-VC11.vcxproj (rev 0) +++ trunk/jazz/portmidi/pm_win/portmidi-VC11.vcxproj 2012-11-30 15:53:45 UTC (rev 924) @@ -0,0 +1,220 @@ +<?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 VC11|Win32"> + <Configuration>Debug VC11</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Debug VC11|x64"> + <Configuration>Debug VC11</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release VC11|Win32"> + <Configuration>Release VC11</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release VC11|x64"> + <Configuration>Release VC11</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <ProjectName>portmidi</ProjectName> + <ProjectGuid>{B460DC87-8C9C-4C33-BEF1-CD6734C676F1}</ProjectGuid> + <RootNamespace>portmidi</RootNamespace> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release VC11|Win32'" Label="Configuration"> + <ConfigurationType>StaticLibrary</ConfigurationType> + <UseOfMfc>false</UseOfMfc> + <CharacterSet>Unicode</CharacterSet> + <PlatformToolset>v110</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug VC11|Win32'" Label="Configuration"> + <ConfigurationType>StaticLibrary</ConfigurationType> + <UseOfMfc>false</UseOfMfc> + <CharacterSet>Unicode</CharacterSet> + <PlatformToolset>v110</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release VC11|x64'" Label="Configuration"> + <ConfigurationType>StaticLibrary</ConfigurationType> + <UseOfMfc>false</UseOfMfc> + <CharacterSet>MultiByte</CharacterSet> + <PlatformToolset>v110</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug VC11|x64'" Label="Configuration"> + <ConfigurationType>StaticLibrary</ConfigurationType> + <UseOfMfc>false</UseOfMfc> + <CharacterSet>MultiByte</CharacterSet> + <PlatformToolset>v110</PlatformToolset> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release VC11|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 VC11|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 VC11|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 VC11|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 VC11|Win32'">BuildDir\$(Platform)\$(Configuration)\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug VC11|Win32'">BuildDir\$(Platform)\$(Configuration)\</IntDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release VC11|Win32'">BuildDir\$(Platform)\$(Configuration)\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Release VC11|Win32'">BuildDir\$(Platform)\$(Configuration)\</IntDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug VC11|x64'">BuildDir\$(Platform)\$(Configuration)\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug VC11|x64'">BuildDir\$(Platform)\$(Configuration)\</IntDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release VC11|x64'">BuildDir\$(Platform)\$(Configuration)\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Release VC11|x64'">BuildDir\$(Platform)\$(Configuration)\</IntDir> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug VC11|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> + <DisableSpecificWarnings>4996</DisableSpecificWarnings> + <RuntimeTypeInfo>true</RuntimeTypeInfo> + </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 VC11|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> + <DisableSpecificWarnings>4996</DisableSpecificWarnings> + </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 VC11|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> + <DisableSpecificWarnings>4996</DisableSpecificWarnings> + </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 VC11|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> + <DisableSpecificWarnings>4996</DisableSpecificWarnings> + </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 Added: trunk/jazz/portmidi/porttime/porttime-VC11.vcxproj =================================================================== --- trunk/jazz/portmidi/porttime/porttime-VC11.vcxproj (rev 0) +++ trunk/jazz/portmidi/porttime/porttime-VC11.vcxproj 2012-11-30 15:53:45 UTC (rev 924) @@ -0,0 +1,207 @@ +<?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 VC11|Win32"> + <Configuration>Debug VC11</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Debug VC11|x64"> + <Configuration>Debug VC11</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release VC11|Win32"> + <Configuration>Release VC11</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release VC11|x64"> + <Configuration>Release VC11</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <ProjectName>porttime</ProjectName> + <ProjectGuid>{8B609D00-8595-4B7B-85C1-F89FEFDE6537}</ProjectGuid> + <RootNamespace>porttime</RootNamespace> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug VC11|Win32'" Label="Configuration"> + <ConfigurationType>StaticLibrary</ConfigurationType> + <UseOfMfc>false</UseOfMfc> + <CharacterSet>Unicode</CharacterSet> + <PlatformToolset>v110</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release VC11|Win32'" Label="Configuration"> + <ConfigurationType>StaticLibrary</ConfigurationType> + <UseOfMfc>false</UseOfMfc> + <CharacterSet>Unicode</CharacterSet> + <PlatformToolset>v110</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug VC11|x64'" Label="Configuration"> + <ConfigurationType>StaticLibrary</ConfigurationType> + <UseOfMfc>false</UseOfMfc> + <CharacterSet>MultiByte</CharacterSet> + <PlatformToolset>v110</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release VC11|x64'" Label="Configuration"> + <ConfigurationType>StaticLibrary</ConfigurationType> + <UseOfMfc>false</UseOfMfc> + <CharacterSet>MultiByte</CharacterSet> + <PlatformToolset>v110</PlatformToolset> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug VC11|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 VC11|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 VC11|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 VC11|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 VC11|Win32'">BuildDir\$(Platform)\$(Configuration)\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Release VC11|Win32'">BuildDir\$(Platform)\$(Configuration)\</IntDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug VC11|Win32'">BuildDir\$(Platform)\$(Configuration)\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug VC11|Win32'">BuildDir\$(Platform)\$(Configuration)\</IntDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release VC11|x64'">BuildDir\$(Platform)\$(Configuration)\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Release VC11|x64'">BuildDir\$(Platform)\$(Configuration)\</IntDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug VC11|x64'">BuildDir\$(Platform)\$(Configuration)\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug VC11|x64'">BuildDir\$(Platform)\$(Configuration)\</IntDir> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release VC11|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 VC11|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> + <RuntimeTypeInfo>true</RuntimeTypeInfo> + </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 VC11|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 VC11|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 Added: trunk/jazz/vc11/JazzPlusPlus-VC11.sln =================================================================== --- trunk/jazz/vc11/JazzPlusPlus-VC11.sln (rev 0) +++ trunk/jazz/vc11/JazzPlusPlus-VC11.sln 2012-11-30 15:53:45 UTC (rev 924) @@ -0,0 +1,49 @@ +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2012 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JazzPlusPlus-VC11", "JazzPlusPlus-VC11.vcxproj", "{B8D2D543-F2F7-4ED4-84B8-6C2794229495}" + ProjectSection(ProjectDependencies) = postProject + {8B609D00-8595-4B7B-85C1-F89FEFDE6537} = {8B609D00-8595-4B7B-85C1-F89FEFDE6537} + {B460DC87-8C9C-4C33-BEF1-CD6734C676F1} = {B460DC87-8C9C-4C33-BEF1-CD6734C676F1} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "portmidi", "..\portmidi\pm_win\portmidi-VC11.vcxproj", "{B460DC87-8C9C-4C33-BEF1-CD6734C676F1}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "porttime", "..\portmidi\porttime\porttime-VC11.vcxproj", "{8B609D00-8595-4B7B-85C1-F89FEFDE6537}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug VC11|Win32 = Debug VC11|Win32 + Debug VC11|x64 = Debug VC11|x64 + Release VC11|Win32 = Release VC11|Win32 + Release VC11|x64 = Release VC11|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {B460DC87-8C9C-4C33-BEF1-CD6734C676F1}.Debug VC11|Win32.ActiveCfg = Debug VC11|Win32 + {B460DC87-8C9C-4C33-BEF1-CD6734C676F1}.Debug VC11|Win32.Build.0 = Debug VC11|Win32 + {B460DC87-8C9C-4C33-BEF1-CD6734C676F1}.Debug VC11|x64.ActiveCfg = Debug VC11|x64 + {B460DC87-8C9C-4C33-BEF1-CD6734C676F1}.Debug VC11|x64.Build.0 = Debug VC11|x64 + {B460DC87-8C9C-4C33-BEF1-CD6734C676F1}.Release VC11|Win32.ActiveCfg = Release VC11|Win32 + {B460DC87-8C9C-4C33-BEF1-CD6734C676F1}.Release VC11|Win32.Build.0 = Release VC11|Win32 + {B460DC87-8C9C-4C33-BEF1-CD6734C676F1}.Release VC11|x64.ActiveCfg = Release VC11|x64 + {B460DC87-8C9C-4C33-BEF1-CD6734C676F1}.Release VC11|x64.Build.0 = Release VC11|x64 + {8B609D00-8595-4B7B-85C1-F89FEFDE6537}.Debug VC11|Win32.ActiveCfg = Debug VC11|Win32 + {8B609D00-8595-4B7B-85C1-F89FEFDE6537}.Debug VC11|Win32.Build.0 = Debug VC11|Win32 + {8B609D00-8595-4B7B-85C1-F89FEFDE6537}.Debug VC11|x64.ActiveCfg = Debug VC11|x64 + {8B609D00-8595-4B7B-85C1-F89FEFDE6537}.Debug VC11|x64.Build.0 = Debug VC11|x64 + {8B609D00-8595-4B7B-85C1-F89FEFDE6537}.Release VC11|Win32.ActiveCfg = Release VC11|Win32 + {8B609D00-8595-4B7B-85C1-F89FEFDE6537}.Release VC11|Win32.Build.0 = Release VC11|Win32 + {8B609D00-8595-4B7B-85C1-F89FEFDE6537}.Release VC11|x64.ActiveCfg = Release VC11|x64 + {8B609D00-8595-4B7B-85C1-F89FEFDE6537}.Release VC11|x64.Build.0 = Release VC11|x64 + {B8D2D543-F2F7-4ED4-84B8-6C2794229495}.Debug VC11|Win32.ActiveCfg = Debug VC11|Win32 + {B8D2D543-F2F7-4ED4-84B8-6C2794229495}.Debug VC11|Win32.Build.0 = Debug VC11|Win32 + {B8D2D543-F2F7-4ED4-84B8-6C2794229495}.Debug VC11|x64.ActiveCfg = Debug VC11|x64 + {B8D2D543-F2F7-4ED4-84B8-6C2794229495}.Debug VC11|x64.Build.0 = Debug VC11|x64 + {B8D2D543-F2F7-4ED4-84B8-6C2794229495}.Release VC11|Win32.ActiveCfg = Release VC11|Win32 + {B8D2D543-F2F7-4ED4-84B8-6C2794229495}.Release VC11|Win32.Build.0 = Release VC11|Win32 + {B8D2D543-F2F7-4ED4-84B8-6C2794229495}.Release VC11|x64.ActiveCfg = Release VC11|x64 + {B8D2D543-F2F7-4ED4-84B8-6C2794229495}.Release VC11|x64.Build.0 = Release VC11|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal Added: trunk/jazz/vc11/JazzPlusPlus-VC11.vcxproj =================================================================== --- trunk/jazz/vc11/JazzPlusPlus-VC11.vcxproj (rev 0) +++ trunk/jazz/vc11/JazzPlusPlus-VC11.vcxproj 2012-11-30 15:53:45 UTC (rev 924) @@ -0,0 +1,517 @@ +<?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 VC11|Win32"> + <Configuration>Debug VC11</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Debug VC11|x64"> + <Configuration>Debug VC11</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release VC11|Win32"> + <Configuration>Release VC11</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release VC11|x64"> + <Configuration>Release VC11</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <ProjectGuid>{B8D2D543-F2F7-4ED4-84B8-6C2794229495}</ProjectGuid> + <RootNamespace>A JazzPlusPlus Application</RootNamespace> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release VC11|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseOfMfc>false</UseOfMfc> + <CharacterSet>Unicode</CharacterSet> + <PlatformToolset>v110</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug VC11|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseOfMfc>false</UseOfMfc> + <CharacterSet>Unicode</CharacterSet> + <PlatformToolset>v110</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release VC11|x64'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseOfMfc>false</UseOfMfc> + <CharacterSet>Unicode</CharacterSet> + <PlatformToolset>v110</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug VC11|x64'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <UseOfMfc>false</UseOfMfc> + <CharacterSet>Unicode</CharacterSet> + <PlatformToolset>v110</PlatformToolset> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release VC11|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 VC11|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 VC11|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 VC11|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 VC11|Win32'">BuildDir\$(Platform)\$(Configuration)\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug VC11|Win32'">BuildDir\$(Platform)\$(Configuration)\</IntDir> + <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug VC11|Win32'">false</LinkIncremental> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug VC11|x64'">BuildDir\$(Platform)\$(Configuration)\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug VC11|x64'">BuildDir\$(Platform)\$(Configuration)\</IntDir> + <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug VC11|x64'">false</LinkIncremental> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release VC11|Win32'">BuildDir\$(Platform)\$(Configuration)\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Release VC11|Win32'">BuildDir\$(Platform)\$(Configuration)\</IntDir> + <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release VC11|Win32'">false</LinkIncremental> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release VC11|x64'">BuildDir\$(Platform)\$(Configuration)\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Release VC11|x64'">BuildDir\$(Platform)\$(Configuration)\</IntDir> + <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release VC11|x64'">false</LinkIncremental> + <TargetName Condition="'$(Configuration)|$(Platform)'=='Release VC11|Win32'">JazzPlusPlus</TargetName> + <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug VC11|Win32'">JazzPlusPlus</TargetName> + <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug VC11|x64'">JazzPlusPlus</TargetName> + <TargetName Condition="'$(Configuration)|$(Platform)'=='Release VC11|x64'">JazzPlusPlus</TargetName> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug VC11|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.4-VC11\lib\vc_lib\mswud;$(EXT_PKGS)\wxMSW-2.9.4-VC11\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.4-VC11\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + </ResourceCompile> + <Link> + <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.4-VC11\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 VC11|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.4-VC11\lib\vc_x64_lib\mswud;$(EXT_PKGS)\wxMSW-2.9.4-VC11\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;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings> + </ClCompile> + <ResourceCompile> + <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <Culture>0x0409</Culture> + <AdditionalIncludeDirectories>$(EXT_PKGS)\wxMSW-2.9.4-VC11\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + </ResourceCompile> + <Link> + <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.4-VC11\lib\vc_x64_lib;%(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 VC11|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.4-VC11\lib\vc_lib\mswu;$(EXT_PKGS)\wxMSW-2.9.4-VC11\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.4-VC11\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + </ResourceCompile> + <Link> + <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.4-VC11\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 VC11|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.4-VC11\lib\vc_x64_lib\mswu;$(EXT_PKGS)\wxMSW-2.9.4-VC11\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;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings> + </ClCompile> + <ResourceCompile> + <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <Culture>0x0409</Culture> + <AdditionalIncludeDirectories>$(EXT_PKGS)\wxMSW-2.9.4-VC11\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + </ResourceCompile> + <Link> + <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.4-VC11\lib\vc_x64_lib;%(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 VC11|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug VC11|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release VC11|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release VC11|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\Dialogs\AudioSettingsDialog.cpp" /> + <ClCompile Include="..\src\Dialogs\SamplesDialog.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\SampleFrame.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 VC11|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug VC11|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release VC11|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release VC11|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\Dialogs\AudioSettingsDialog.h" /> + <ClInclude Include="..\src\Dialogs\SamplesDialog.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\SampleFrame.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> + <None Include="..\src\HelpFiles\tex2rtf.ini" /> + <None Include="..\src\Makefile.am" /> + </ItemGroup> + <ItemGroup> + <ProjectReference Include="..\portmidi\pm_win\portmidi-VC11.vcxproj"> + <Project>{b460dc87-8c9c-4c33-bef1-cd6734c676f1}</Project> + </ProjectReference> + <ProjectReference Include="..\portmidi\porttime\porttime-VC11.vcxproj"> + <Project>{8b609d00-8595-4b7b-85c1-f89fefde6537}</Project> + </ProjectReference> + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> +</Project> \ No newline at end of file Added: trunk/jazz/vc11/JazzPlusPlus-VC11.vcxproj.filters =================================================================== --- trunk/jazz/vc11/JazzPlusPlus-VC11.vcxproj.filters (rev 0) +++ trunk/jazz/vc11/JazzPlusPlus-VC11.vcxproj.filters 2012-11-30 15:53:45 UTC (rev 924) @@ -0,0 +1,328 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup> + <ClCompile Include="..\src\AsciiMidiFile.cpp" /> + <ClCompile Include="..\src\Audio.cpp" /> + <ClCompile Include="..\src\ClockDialog.cpp" /> + <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\Gui... [truncated message content] |
From: <pst...@us...> - 2012-11-30 15:52:07
|
Revision: 923 http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=923&view=rev Author: pstieber Date: 2012-11-30 15:51:56 +0000 (Fri, 30 Nov 2012) Log Message: ----------- Added a header sentry. Modified Paths: -------------- trunk/jazz/portmidi/porttime/porttime.h Modified: trunk/jazz/portmidi/porttime/porttime.h =================================================================== --- trunk/jazz/portmidi/porttime/porttime.h 2012-11-30 00:55:20 UTC (rev 922) +++ trunk/jazz/portmidi/porttime/porttime.h 2012-11-30 15:51:56 UTC (rev 923) @@ -7,6 +7,8 @@ /* Should there be a way to choose the source of time here? */ +#pragma once + #ifdef __cplusplus extern "C" { #endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pst...@us...> - 2012-11-30 00:55:26
|
Revision: 922 http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=922&view=rev Author: pstieber Date: 2012-11-30 00:55:20 +0000 (Fri, 30 Nov 2012) Log Message: ----------- Renamed a directory. VS 2008 = VC9 VS 2010 = VC10 VS 2012 = VC11 This throws me off. Added Paths: ----------- trunk/jazz/vc11/ Removed Paths: ------------- trunk/jazz/vc12/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pst...@us...> - 2012-11-30 00:28:32
|
Revision: 921 http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=921&view=rev Author: pstieber Date: 2012-11-30 00:28:26 +0000 (Fri, 30 Nov 2012) Log Message: ----------- Updated the wxWidgets path for the 64-bit build. Modified Paths: -------------- trunk/jazz/vc10/JazzPlusPlus-VC10.vcxproj Modified: trunk/jazz/vc10/JazzPlusPlus-VC10.vcxproj =================================================================== --- trunk/jazz/vc10/JazzPlusPlus-VC10.vcxproj 2012-11-29 21:26:27 UTC (rev 920) +++ trunk/jazz/vc10/JazzPlusPlus-VC10.vcxproj 2012-11-30 00:28:26 UTC (rev 921) @@ -141,7 +141,7 @@ </Midl> <ClCompile> <Optimization>Disabled</Optimization> - <AdditionalIncludeDirectories>$(EXT_PKGS)\wxMSW-2.9.4-VC10\lib\vc_amd64_lib\mswud;$(EXT_PKGS)\wxMSW-2.9.4-VC10\include;..\src;..\src\mswin;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>$(EXT_PKGS)\wxMSW-2.9.4-VC10\lib\vc_x64_lib\mswud;$(EXT_PKGS)\wxMSW-2.9.4-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> @@ -168,7 +168,7 @@ <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.4-VC10\lib\vc_amd64_lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <AdditionalLibraryDirectories>$(EXT_PKGS)\wxMSW-2.9.4-VC10\lib\vc_x64_lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries> <GenerateDebugInformation>true</GenerateDebugInformation> <ProgramDatabaseFile>.\$(OutDir)JazzPlusPlus.pdb</ProgramDatabaseFile> @@ -243,7 +243,7 @@ <ClCompile> <Optimization>Full</Optimization> <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> - <AdditionalIncludeDirectories>$(EXT_PKGS)\wxMSW-2.9.4-VC10\lib\vc_amd64_lib\mswu;$(EXT_PKGS)\wxMSW-2.9.4-VC10\include;..\src;..\src\mswin;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>$(EXT_PKGS)\wxMSW-2.9.4-VC10\lib\vc_x64_lib\mswu;$(EXT_PKGS)\wxMSW-2.9.4-VC10\include;..\src;..\src\mswin;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>NDEBUG;_WINDOWS;WINVER=0x0501;STRICT;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions> <StringPooling>true</StringPooling> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> @@ -272,7 +272,7 @@ <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.4-VC10\lib\vc_amd64_lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <AdditionalLibraryDirectories>$(EXT_PKGS)\wxMSW-2.9.4-VC10\lib\vc_x64_lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries> <ProgramDatabaseFile>.\$(OutDir)JazzPlusPlus.pdb</ProgramDatabaseFile> <SubSystem>Windows</SubSystem> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pst...@us...> - 2012-11-29 21:26:33
|
Revision: 920 http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=920&view=rev Author: pstieber Date: 2012-11-29 21:26:27 +0000 (Thu, 29 Nov 2012) Log Message: ----------- Moved the about dialog to the dialog filter. Modified Paths: -------------- trunk/jazz/vc9/JazzPlusPlus-VC9.vcproj Modified: trunk/jazz/vc9/JazzPlusPlus-VC9.vcproj =================================================================== --- trunk/jazz/vc9/JazzPlusPlus-VC9.vcproj 2012-11-29 21:25:25 UTC (rev 919) +++ trunk/jazz/vc9/JazzPlusPlus-VC9.vcproj 2012-11-29 21:26:27 UTC (rev 920) @@ -426,14 +426,6 @@ Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;h;hpp;hxx;hm;inl" > <File - RelativePath="..\src\AboutDialog.cpp" - > - </File> - <File - RelativePath="..\src\AboutDialog.h" - > - </File> - <File RelativePath="..\src\AsciiMidiFile.cpp" > </File> @@ -1077,6 +1069,14 @@ Name="Dialog Source Files" > <File + RelativePath="..\src\AboutDialog.cpp" + > + </File> + <File + RelativePath="..\src\AboutDialog.h" + > + </File> + <File RelativePath="..\src\Dialogs\AudioSettingsDialog.cpp" > </File> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pst...@us...> - 2012-11-29 21:25:32
|
Revision: 919 http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=919&view=rev Author: pstieber Date: 2012-11-29 21:25:25 +0000 (Thu, 29 Nov 2012) Log Message: ----------- Disabled VS warning 4996. 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 2012-11-29 21:23:42 UTC (rev 918) +++ trunk/jazz/portmidi/pm_win/portmidi-VC10.vcxproj 2012-11-29 21:25:25 UTC (rev 919) @@ -86,6 +86,7 @@ <WarningLevel>Level3</WarningLevel> <SuppressStartupBanner>true</SuppressStartupBanner> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> + <DisableSpecificWarnings>4996</DisableSpecificWarnings> </ClCompile> <ResourceCompile> <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> @@ -115,6 +116,7 @@ <ProgramDataBaseFileName>.\$(OutDir)</ProgramDataBaseFileName> <WarningLevel>Level3</WarningLevel> <SuppressStartupBanner>true</SuppressStartupBanner> + <DisableSpecificWarnings>4996</DisableSpecificWarnings> </ClCompile> <ResourceCompile> <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> @@ -147,6 +149,7 @@ <WarningLevel>Level3</WarningLevel> <SuppressStartupBanner>true</SuppressStartupBanner> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> + <DisableSpecificWarnings>4996</DisableSpecificWarnings> </ClCompile> <ResourceCompile> <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> @@ -179,6 +182,7 @@ <ProgramDataBaseFileName>.\$(OutDir)</ProgramDataBaseFileName> <WarningLevel>Level3</WarningLevel> <SuppressStartupBanner>true</SuppressStartupBanner> + <DisableSpecificWarnings>4996</DisableSpecificWarnings> </ClCompile> <ResourceCompile> <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |