Menu
▾
▴
SF.net SVN: jazzplusplus:[939] trunk/jazz
|
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.
|
