[Sv1-commits] SF.net SVN: sv1:[1623] sonic-visualiser/trunk

[<ca...@us...>]

Revision: 1623
          http://sv1.svn.sourceforge.net/sv1/?rev=1623&view=rev
Author:   cannam
Date:     2009-09-10 19:19:21 +0000 (Thu, 10 Sep 2009)

Log Message:
-----------

* use dummy driver only for RtMidi on Solaris

Modified Paths:
--------------
    sonic-visualiser/trunk/data/data.pro
    sonic-visualiser/trunk/data/midi/rtmidi/RtMidi.cpp
    sonic-visualiser/trunk/sv/sv.pro

Modified: sonic-visualiser/trunk/data/data.pro
===================================================================
--- sonic-visualiser/trunk/data/data.pro	2009-09-10 18:44:45 UTC (rev 1622)
+++ sonic-visualiser/trunk/data/data.pro	2009-09-10 19:19:21 UTC (rev 1623)
@@ -15,9 +15,10 @@
 MOC_DIR = tmp_moc
 
 # Set up suitable platform defines for RtMidi
-linux*: DEFINES += __LINUX_ALSASEQ__
-macx*:  DEFINES += __MACOSX_CORE__
-win*:   DEFINES += __WINDOWS_MM__
+linux*:   DEFINES += __LINUX_ALSASEQ__
+macx*:    DEFINES += __MACOSX_CORE__
+win*:     DEFINES += __WINDOWS_MM__
+solaris*: DEFINES += __RTMIDI_DUMMY_ONLY__
 
 # Input
 HEADERS += fft/FFTapi.h \

Modified: sonic-visualiser/trunk/data/midi/rtmidi/RtMidi.cpp
===================================================================
--- sonic-visualiser/trunk/data/midi/rtmidi/RtMidi.cpp	2009-09-10 18:44:45 UTC (rev 1622)
+++ sonic-visualiser/trunk/data/midi/rtmidi/RtMidi.cpp	2009-09-10 19:19:21 UTC (rev 1623)
@@ -2193,3 +2193,72 @@
 }
 
 #endif  // __WINDOWS_MM__
+
+#ifdef __RTMIDI_DUMMY_ONLY__
+
+void RtMidiIn :: initialize( const std::string& /*clientName*/ )
+{
+}
+
+void RtMidiIn :: openPort( unsigned int portNumber, const std::string /*portName*/ )
+{
+}
+
+void RtMidiIn :: openVirtualPort( std::string portName )
+{
+}
+
+void RtMidiIn :: closePort( void )
+{
+}
+
+RtMidiIn :: ~RtMidiIn()
+{
+}
+
+unsigned int RtMidiIn :: getPortCount()
+{
+    return 0;
+}
+
+std::string RtMidiIn :: getPortName( unsigned int portNumber )
+{
+    return "";
+}
+
+unsigned int RtMidiOut :: getPortCount()
+{
+    return 0;
+}
+
+std::string RtMidiOut :: getPortName( unsigned int portNumber )
+{
+    return "";
+}
+
+void RtMidiOut :: initialize( const std::string& /*clientName*/ )
+{
+}
+
+void RtMidiOut :: openPort( unsigned int portNumber, const std::string /*portName*/ )
+{
+}
+
+void RtMidiOut :: closePort( void )
+{
+}
+
+void RtMidiOut :: openVirtualPort( std::string portName )
+{
+}
+
+RtMidiOut :: ~RtMidiOut()
+{
+}
+
+void RtMidiOut :: sendMessage( std::vector<unsigned char> *message )
+{
+}
+
+#endif __RTMIDI_DUMMY_ONLY__
+

Modified: sonic-visualiser/trunk/sv/sv.pro
===================================================================
--- sonic-visualiser/trunk/sv/sv.pro	2009-09-10 18:44:45 UTC (rev 1622)
+++ sonic-visualiser/trunk/sv/sv.pro	2009-09-10 19:19:21 UTC (rev 1623)
@@ -9,7 +9,8 @@
 QT += xml network
 
 TARGET = "Sonic Visualiser"
-linux-g++*:TARGET = sonic-visualiser
+linux*:TARGET = sonic-visualiser
+solaris*:TARGET = sonic-visualiser
 
 ICON = icons/sv-macicon.icns
 RC_FILE = icons/sv.rc


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