Merge branch 'develop'

GRIS-UdeM · Aug 25, 2017 · 82a8a10 · 82a8a10
2 parents 5cd4b7a + 6723787
commit 82a8a10
Show file tree

Hide file tree

Showing 22 changed files with 570 additions and 502 deletions.
diff --git a/Builds/LinuxMakefile/Makefile b/Builds/LinuxMakefile/Makefile
@@ -33,7 +33,7 @@ ifeq ($(CONFIG),Debug)
     TARGET_ARCH := -march=native
   endif
 
-  JUCE_CPPFLAGS := $(DEPFLAGS) -DLINUX=1 -DDEBUG=1 -D_DEBUG=1 -DJUCER_LINUX_MAKE_6D53C8B4=1 -DJUCE_APP_VERSION=0.0.6 -DJUCE_APP_VERSION_HEX=0x6 $(shell pkg-config --cflags alsa freetype2 libcurl x11 xext xinerama jack gtk+-3.0 webkit2gtk-4.0) -pthread -I/usr/include/libsoup-2.4 -I$(HOME)/git/JUCE/modules $(CPPFLAGS)
+  JUCE_CPPFLAGS := $(DEPFLAGS) -DLINUX=1 -DDEBUG=1 -D_DEBUG=1 -DJUCER_LINUX_MAKE_6D53C8B4=1 -DJUCE_APP_VERSION=0.0.7 -DJUCE_APP_VERSION_HEX=0x7 $(shell pkg-config --cflags alsa freetype2 libcurl x11 xext xinerama jack gtk+-3.0 webkit2gtk-4.0) -pthread -I/usr/include/libsoup-2.4 -I$(HOME)/git/JUCE/modules $(CPPFLAGS)
   JUCE_CFLAGS += $(JUCE_CPPFLAGS) $(TARGET_ARCH) -g -ggdb -O0 $(CFLAGS)
   JUCE_CXXFLAGS += $(JUCE_CFLAGS) -std=c++11 $(CXXFLAGS)
   JUCE_LDFLAGS += $(TARGET_ARCH) -L$(JUCE_BINDIR) -L$(JUCE_LIBDIR) -L/usr/lib/x86_64-linux-gnu $(shell pkg-config --libs alsa freetype2 libcurl x11 xext xinerama jack gtk+-3.0 webkit2gtk-4.0) -lGL -lGLU -lglut -ldl -lpthread -lrt -ljackserver  $(LDFLAGS)
@@ -53,7 +53,7 @@ ifeq ($(CONFIG),Release)
     TARGET_ARCH := -march=native
   endif
 
-JUCE_CPPFLAGS := $(DEPFLAGS) -DLINUX=1 -DNDEBUG=1 -DJUCER_LINUX_MAKE_6D53C8B4=1 -DJUCE_APP_VERSION=0.0.6 -DJUCE_APP_VERSION_HEX=0x6 $(shell pkg-config --cflags alsa freetype2 libcurl x11 xext xinerama jack gtk+-3.0 webkit2gtk-4.0) -pthread -I../../JuceLibraryCode -I/usr/include/libsoup-2.4 -I$(HOME)/git/JUCE/modules $(CPPFLAGS)
+JUCE_CPPFLAGS := $(DEPFLAGS) -DLINUX=1 -DNDEBUG=1 -DJUCER_LINUX_MAKE_6D53C8B4=1 -DJUCE_APP_VERSION=0.0.7 -DJUCE_APP_VERSION_HEX=0x7 $(shell pkg-config --cflags alsa freetype2 libcurl x11 xext xinerama jack gtk+-3.0 webkit2gtk-4.0) -pthread -I../../JuceLibraryCode -I/usr/include/libsoup-2.4 -I$(HOME)/git/JUCE/modules $(CPPFLAGS)
   JUCE_CFLAGS += $(JUCE_CPPFLAGS) $(TARGET_ARCH) -O3 -Wall $(CFLAGS)
   JUCE_CXXFLAGS += $(JUCE_CFLAGS) -std=c++11 $(CXXFLAGS)
   JUCE_LDFLAGS += $(TARGET_ARCH) -L$(JUCE_BINDIR) -L$(JUCE_LIBDIR) -fvisibility=hidden -L/usr/lib/x86_64-linux-gnu $(shell pkg-config --libs alsa freetype2 libcurl x11 xext xinerama jack gtk+-3.0 webkit2gtk-4.0) -lGL -lGLU -lglut -ldl -lpthread -lrt -ljackserver  $(LDFLAGS)

diff --git a/Builds/MacOSX/Info-App.plist b/Builds/MacOSX/Info-App.plist
@@ -15,11 +15,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.0.6</string>
+	<string>0.0.7</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>0.0.6</string>
+	<string>0.0.7</string>
 	<key>NSHighResolutionCapable</key>
 	<true/>
 	<key>NSHumanReadableCopyright</key>

diff --git a/Builds/MacOSX/Info.plist b/Builds/MacOSX/Info.plist
@@ -11,11 +11,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.0.6</string>
+	<string>0.0.7</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>0.0.6</string>
+	<string>0.0.7</string>
 	<key>NSHighResolutionCapable</key>
 	<true/>
 	<key>NSHumanReadableCopyright</key>

diff --git a/Builds/MacOSX/JAS.jpil b/Builds/MacOSX/JAS.jpil
@@ -1 +1 @@
-	256	-1	256	-1	1	-1	0	-1	0	-1	0	-1	0	-1	de_RME_driver_USBAudioEngine:16B13F9	-1	AppleHDAEngineOutput:1B,0,1,2:0	-1	0	-1	0	-1	0	-1	0
+	128	-1	128	-1	0	-1	0	-1	0	-1	0	-1	0	-1	AppleUSBAudioEngine:Unknown Manufacturer:Generic USB Audio Device   :14100000:2	-1	AppleHDAEngineOutput:1B,0,1,2:0	-1	0	-1	0	-1	0	-1	0
diff --git a/Builds/MacOSX/ServerGRIS.xcodeproj/project.pbxproj b/Builds/MacOSX/ServerGRIS.xcodeproj/project.pbxproj
@@ -3826,8 +3826,8 @@
 					"_NDEBUG=1",
 					"NDEBUG=1",
 					"JUCER_XCODE_MAC_F6D2F4CF=1",
-					"JUCE_APP_VERSION=0.0.6",
-					"JUCE_APP_VERSION_HEX=0x6",
+					"JUCE_APP_VERSION=0.0.7",
+					"JUCE_APP_VERSION_HEX=0x7",
 				);
 				GCC_SYMBOLS_PRIVATE_EXTERN = YES;
 				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
@@ -3906,8 +3906,8 @@
 					"_DEBUG=1",
 					"DEBUG=1",
 					"JUCER_XCODE_MAC_F6D2F4CF=1",
-					"JUCE_APP_VERSION=0.0.6",
-					"JUCE_APP_VERSION_HEX=0x6",
+					"JUCE_APP_VERSION=0.0.7",
+					"JUCE_APP_VERSION_HEX=0x7",
 				);
 				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				HEADER_SEARCH_PATHS = (

diff --git a/Builds/VisualStudio2015/ServerGRIS.vcxproj b/Builds/VisualStudio2015/ServerGRIS.vcxproj
@@ -58,7 +58,7 @@
       <Optimization>Disabled</Optimization>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
       <AdditionalIncludeDirectories>..\..\JuceLibraryCode;..\..\JuceLibraryCode\modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2015_78A5022=1;JUCE_APP_VERSION=0.0.6;JUCE_APP_VERSION_HEX=0x6;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2015_78A5022=1;JUCE_APP_VERSION=0.0.7;JUCE_APP_VERSION_HEX=0x7;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
       <PrecompiledHeader/>
@@ -99,7 +99,7 @@
     <ClCompile>
       <Optimization>Full</Optimization>
       <AdditionalIncludeDirectories>..\..\JuceLibraryCode;..\..\JuceLibraryCode\modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;JUCER_VS2015_78A5022=1;JUCE_APP_VERSION=0.0.6;JUCE_APP_VERSION_HEX=0x6;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;JUCER_VS2015_78A5022=1;JUCE_APP_VERSION=0.0.7;JUCE_APP_VERSION_HEX=0x7;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
       <PrecompiledHeader/>

diff --git a/Builds/VisualStudio2015/ServerGRIS_App.vcxproj b/Builds/VisualStudio2015/ServerGRIS_App.vcxproj
@@ -66,7 +66,7 @@
       <Optimization>Disabled</Optimization>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
       <AdditionalIncludeDirectories>..\..\JuceLibraryCode;..\..\JuceLibraryCode\modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2015_78A5022=1;JUCE_APP_VERSION=0.0.6;JUCE_APP_VERSION_HEX=0x6;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2015_78A5022=1;JUCE_APP_VERSION=0.0.7;JUCE_APP_VERSION_HEX=0x7;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
       <PrecompiledHeader/>
@@ -107,7 +107,7 @@
     <ClCompile>
       <Optimization>Full</Optimization>
       <AdditionalIncludeDirectories>..\..\JuceLibraryCode;..\..\JuceLibraryCode\modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;JUCER_VS2015_78A5022=1;JUCE_APP_VERSION=0.0.6;JUCE_APP_VERSION_HEX=0x6;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;JUCER_VS2015_78A5022=1;JUCE_APP_VERSION=0.0.7;JUCE_APP_VERSION_HEX=0x7;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
       <PrecompiledHeader/>

diff --git a/JuceLibraryCode/JuceHeader.h b/JuceLibraryCode/JuceHeader.h
@@ -43,8 +43,8 @@
 namespace ProjectInfo
 {
     const char* const  projectName    = "ServerGRIS";
-    const char* const  versionString  = "0.0.6";
-    const int          versionNumber  = 0x6;
+    const char* const  versionString  = "0.0.7";
+    const int          versionNumber  = 0x7;
 }
 #endif
 

diff --git a/Resources/JAS.jpil b/Resources/JAS.jpil
@@ -1 +1 @@
-	256	-1	256	-1	1	-1	0	-1	0	-1	0	-1	0	-1	de_RME_driver_USBAudioEngine:16B13F9	-1	AppleHDAEngineOutput:1B,0,1,2:0	-1	0	-1	0	-1	0	-1	0
+	128	-1	128	-1	0	-1	0	-1	0	-1	0	-1	0	-1	AppleUSBAudioEngine:Unknown Manufacturer:Generic USB Audio Device   :14100000:2	-1	AppleHDAEngineOutput:1B,0,1,2:0	-1	0	-1	0	-1	0	-1	0
diff --git a/Source/Main.cpp b/Source/Main.cpp
@@ -1,21 +1,21 @@
-/*
- This file is part of ServerGris.
- 
- Developers: Nicolas Masson
- 
- ServerGris 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 3 of the License, or
- (at your option) any later version.
- 
- ServerGris 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 ServerGris.  If not, see <http://www.gnu.org/licenses/>.
- */
+/*
+ This file is part of ServerGris.
+ 
+ Developers: Nicolas Masson
+ 
+ ServerGris 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 3 of the License, or
+ (at your option) any later version.
+ 
+ ServerGris 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 ServerGris.  If not, see <http://www.gnu.org/licenses/>.
+ */
 
 #include "../JuceLibraryCode/JuceHeader.h"
 #include "GrisLookAndFeel.h"
@@ -78,15 +78,6 @@ class ServerGRISApplication  : public JUCEApplication
         MainWindow (String name)  : DocumentWindow (name,Colours::lightgrey,DocumentWindow::allButtons)
         {
             setUsingNativeTitleBar (true);
-
-            // Copy JackRouter ini file to preferences folder if not already done.
-#ifndef __linux__
-            File target = File("~/Library/Preferences/JAS.jpil");
-            File source = File(File::getCurrentWorkingDirectory().getFullPathName()+("/ServerGRIS.app/Contents/Resources/JAS.jpil"));
-            if (target.existsAsFile() == false) {
-                source.copyFileTo(target);
-            }
-#endif
             mcc = new MainContentComponent(this);
             setContentOwned (mcc, true);
             setResizable (true, true);
@@ -116,7 +107,7 @@ class ServerGRISApplication  : public JUCEApplication
            subclass also calls the superclass's method.
         */
 
-    private:
+    private:
         MainContentComponent * mcc;
         JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (MainWindow)
     };
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		256 -1 256 -1 1 -1 0 -1 0 -1 0 -1 0 -1 de_RME_driver_USBAudioEngine:16B13F9 -1 AppleHDAEngineOutput:1B,0,1,2:0 -1 0 -1 0 -1 0 -1 0
		128 -1 128 -1 0 -1 0 -1 0 -1 0 -1 0 -1 AppleUSBAudioEngine:Unknown Manufacturer:Generic USB Audio Device :14100000:2 -1 AppleHDAEngineOutput:1B,0,1,2:0 -1 0 -1 0 -1 0 -1 0