[Traverso-commit] traverso/src/engine AudioDevice.cpp AudioDevice.h

[Remon Sijrier]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Remon Sijrier <r_sijrier>       07/12/07 11:22:33

Modified files:
        src/engine     : AudioDevice.cpp AudioDevice.h 

Log message:
        * return after calling set_parameters() in calling set_parameters(), we 
don't want to continue in calling set_paramters() then!
        * declaring a slot seems not to work in a #define

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/engine/AudioDevice.cpp?cvsroot=traverso&r1=1.48&r2=1.49
http://cvs.savannah.gnu.org/viewcvs/traverso/src/engine/AudioDevice.h?cvsroot=traverso&r1=1.26&r2=1.27

Patches:
Index: AudioDevice.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/engine/AudioDevice.cpp,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -b -r1.48 -r1.49
--- AudioDevice.cpp     19 Nov 2007 11:18:54 -0000      1.48
+++ AudioDevice.cpp     7 Dec 2007 11:22:32 -0000       1.49
@@ -17,7 +17,7 @@
 along with this program; if not, write to the Free Software
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA.
 
-$Id: AudioDevice.cpp,v 1.48 2007/11/19 11:18:54 r_sijrier Exp $
+$Id: AudioDevice.cpp,v 1.49 2007/12/07 11:22:32 r_sijrier Exp $
 */
 
 #include "AudioDevice.h"
@@ -379,6 +379,7 @@
                        if (driver->start() == -1) {
                                // jack driver failed to start, fallback to 
Null Driver:
                                set_parameters(rate, bufferSize, "Null Driver");
+                               return;
                        }
                        
                        connect(&jackShutDownChecker, SIGNAL(timeout()), this, 
SLOT(check_jack_shutdown()));
@@ -391,6 +392,7 @@
                if (driver->start() == -1) {
                        // PortAudio driver failed to start, fallback to Null 
Driver:
                        set_parameters(rate, bufferSize, "Null Driver");
+                       return;
                }
        }
 
@@ -730,9 +732,9 @@
        }
 }
 
-#if defined (JACK_SUPPORT)
 void AudioDevice::check_jack_shutdown()
 {
+#if defined (JACK_SUPPORT)
        if (libjack_is_present) {
                JackDriver* jackdriver = qobject_cast<JackDriver*>(driver);
                if (jackdriver) {
@@ -746,9 +748,9 @@
                        }
                }
        }
+#endif
 }
 
-#endif
 
 void AudioDevice::switch_to_null_driver()
 {

Index: AudioDevice.h
===================================================================
RCS file: /sources/traverso/traverso/src/engine/AudioDevice.h,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- AudioDevice.h       12 Nov 2007 18:52:14 -0000      1.26
+++ AudioDevice.h       7 Dec 2007 11:22:32 -0000       1.27
@@ -17,7 +17,7 @@
 along with this program; if not, write to the Free Software
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA.
 
-$Id: AudioDevice.h,v 1.26 2007/11/12 18:52:14 r_sijrier Exp $
+$Id: AudioDevice.h,v 1.27 2007/12/07 11:22:32 r_sijrier Exp $
 */
 
 #ifndef AUDIODEVICE_H
@@ -257,9 +257,7 @@
        void audiothread_finished();
        void switch_to_null_driver();
        void reset_xrun_counter() {m_xrunCount = 0;}
-#if defined (JACK_SUPPORT)
        void check_jack_shutdown();
-#endif
 };