[Traverso-commit] traverso deploy-osx.sh src/commands/AudioClipEx...

[Nicola Doebelin]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Nicola Doebelin <n_doebelin>    07/07/01 12:26:33

Modified files:
        .              : deploy-osx.sh 
        src/commands   : AudioClipExternalProcessing.cpp 

Log message:
        Ported external clip processing to OS X

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/deploy-osx.sh?cvsroot=traverso&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/traverso/src/commands/AudioClipExternalProcessing.cpp?cvsroot=traverso&r1=1.14&r2=1.15

Patches:
Index: deploy-osx.sh
===================================================================
RCS file: /sources/traverso/traverso/deploy-osx.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- deploy-osx.sh       30 Jun 2007 13:06:50 -0000      1.4
+++ deploy-osx.sh       1 Jul 2007 12:26:33 -0000       1.5
@@ -7,6 +7,7 @@
 QT_PATH=/usr/local/Trolltech/Qt-4.3.0
 
 cp /opt/local/bin/cdrdao traverso.app/Contents/MacOS/
+cp /usr/local/bin/sox traverso.app/Contents/MacOS/
 
 mkdir -p traverso.app/Contents/Frameworks
 mkdir -p traverso.app/Contents/Frameworks/QtXml.framework/Versions/4/
@@ -63,3 +64,5 @@
 install_name_tool -change /usr/local/lib/libraptor.1.dylib 
@executable_path/../Frameworks/libraptor.1.dylib 
traverso.app/Contents/Frameworks/librasqal.0.dylib
 #install_name_tool -change /usr/local/lib/libintl.8.dylib 
@executable_path/../Frameworks/libintl.8.dylib 
traverso.app/Contents/Frameworks/libglib-2.0.0.dylib
 
+mv traverso.app Traverso.app
+

Index: src/commands/AudioClipExternalProcessing.cpp
===================================================================
RCS file: 
/sources/traverso/traverso/src/commands/AudioClipExternalProcessing.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- src/commands/AudioClipExternalProcessing.cpp        26 Jun 2007 22:08:32 
-0000      1.14
+++ src/commands/AudioClipExternalProcessing.cpp        1 Jul 2007 12:26:33 
-0000       1.15
@@ -36,6 +36,7 @@
 
 #include <QThread>
 #include <QFile>
+#include <QApplication>
 
 
 // Always put me below _all_ includes, this is needed
@@ -230,7 +231,7 @@
 {
        m_arguments.clear();
        
-       if (m_program == "sox") {
+       if (m_program.right(3) == "sox") {
                m_arguments.append("-S");
        }
        
@@ -252,7 +253,7 @@
 {
        if (m_queryOptions) {
                QString result = m_processor->readAllStandardOutput();
-               if (m_program == "sox") {
+               if (m_program.right(3) == "sox") {
                        QStringList list = result.split("\n");
                        foreach(QString string, list) {
                                if (string.contains("Supported effects:") || 
string.contains("effect:") || string.contains("SUPPORTED EFFECTS:")) {
@@ -348,6 +349,10 @@
 {
        m_program = text;
        if (m_program == "sox") {
+               #if defined (Q_WS_MAC)
+                       m_program = qApp->applicationDirPath() + "/sox";
+               #endif
+
                query_options();
                argsComboBox->show();
                argsComboBox->setToolTip(tr("Available arguments for the sox 
program"));