[Traverso-commit] traverso/src core/Export.cpp core/Export.h core...

[Ben Levitt]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Ben Levitt <benjie>     07/08/13 00:01:53

Modified files:
        src/core       : Export.cpp Export.h Song.cpp WriteSource.cpp 
        src/audiofileio/encode: AbstractAudioWriter.h SFAudioWriter.cpp 
                                SFAudioWriter.h WPAudioWriter.cpp 
                                WPAudioWriter.h 
        src/traverso   : ExportWidget.cpp 

Log message:
        Clean up export's extension handling, add wavpack export into the 
ExportWidget gui

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/Export.cpp?cvsroot=traverso&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/Export.h?cvsroot=traverso&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/Song.cpp?cvsroot=traverso&r1=1.127&r2=1.128
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/WriteSource.cpp?cvsroot=traverso&r1=1.29&r2=1.30
http://cvs.savannah.gnu.org/viewcvs/traverso/src/audiofileio/encode/AbstractAudioWriter.h?cvsroot=traverso&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/traverso/src/audiofileio/encode/SFAudioWriter.cpp?cvsroot=traverso&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/traverso/src/audiofileio/encode/SFAudioWriter.h?cvsroot=traverso&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/traverso/src/audiofileio/encode/WPAudioWriter.cpp?cvsroot=traverso&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/traverso/src/audiofileio/encode/WPAudioWriter.h?cvsroot=traverso&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/ExportWidget.cpp?cvsroot=traverso&r1=1.50&r2=1.51

Patches:
Index: core/Export.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/Export.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- core/Export.cpp     3 Aug 2007 23:05:03 -0000       1.9
+++ core/Export.cpp     13 Aug 2007 00:01:52 -0000      1.10
@@ -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: Export.cpp,v 1.9 2007/08/03 23:05:03 benjie Exp $
+    $Id: Export.cpp,v 1.10 2007/08/13 00:01:52 benjie Exp $
 */
 
 #include "Export.h"
@@ -55,7 +55,6 @@
        
        total_frames = -1;
        pos = -1;
-       extension = "";
        
        allSongs = false;
        stop = false;
@@ -125,11 +124,6 @@
                return -1;
        }
        
-       if (extension.isEmpty() && isRecording == 0) {
-               printf("ExportSpecification: No extension configured!\n");
-               return -1;
-       }
-
        if (exportdir.isEmpty()) {
                printf("ExportSpecification: No export dir configured!\n");
                return -1;

Index: core/Export.h
===================================================================
RCS file: /sources/traverso/traverso/src/core/Export.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- core/Export.h       3 Aug 2007 23:05:03 -0000       1.12
+++ core/Export.h       13 Aug 2007 00:01:52 -0000      1.13
@@ -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: Export.h,v 1.12 2007/08/03 23:05:03 benjie Exp $
+$Id: Export.h,v 1.13 2007/08/13 00:01:52 benjie Exp $
 */
 
 #ifndef EXPORT_H
@@ -63,7 +63,6 @@
        long            total_frames;
        QMap<QString, QString>  extraFormat;
        long            pos;
-       QString         extension;
 
        /* shared between UI thread and audio thread */
 

Index: core/Song.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/Song.cpp,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -b -r1.127 -r1.128
--- core/Song.cpp       11 Aug 2007 22:54:57 -0000      1.127
+++ core/Song.cpp       13 Aug 2007 00:01:52 -0000      1.128
@@ -395,7 +395,7 @@
        spec->progress = 0;
 
        spec->basename = "Song" + 
QString::number(m_project->get_song_index(m_id)) +"-" + title;
-       spec->name = spec->basename + spec->extension;
+       spec->name = spec->basename;
 
        if (spec->start_frame >= spec->end_frame) {
                info().warning(tr("Export start frame starts beyond export end 
frame!!"));

Index: core/WriteSource.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/WriteSource.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- core/WriteSource.cpp        12 Aug 2007 20:12:06 -0000      1.29
+++ core/WriteSource.cpp        13 Aug 2007 00:01:52 -0000      1.30
@@ -288,8 +288,9 @@
        
        QString name = m_fileName;
        if (m_spec->isRecording) {
-               name.append("-ch" + QByteArray::number(m_channelNumber) + "." + 
m_writer->get_default_extension());
+               name.append("-ch" + QByteArray::number(m_channelNumber));
        }
+       name.append(m_writer->get_extension());
        
        if (m_writer->open(name) == false) {
                return -1;

Index: audiofileio/encode/AbstractAudioWriter.h
===================================================================
RCS file: 
/sources/traverso/traverso/src/audiofileio/encode/AbstractAudioWriter.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- audiofileio/encode/AbstractAudioWriter.h    11 Aug 2007 21:45:28 -0000      
1.4
+++ audiofileio/encode/AbstractAudioWriter.h    13 Aug 2007 00:01:52 -0000      
1.5
@@ -36,7 +36,7 @@
        AbstractAudioWriter();
        ~AbstractAudioWriter();
        
-       virtual const char* get_default_extension() = 0;
+       virtual const char* get_extension() = 0;
        
        void set_num_channels(int channels);
        void set_bits_per_sample(int bits);

Index: audiofileio/encode/SFAudioWriter.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/audiofileio/encode/SFAudioWriter.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- audiofileio/encode/SFAudioWriter.cpp        11 Aug 2007 21:45:28 -0000      
1.3
+++ audiofileio/encode/SFAudioWriter.cpp        13 Aug 2007 00:01:52 -0000      
1.4
@@ -43,9 +43,18 @@
 }
 
 
-const char* SFAudioWriter::get_default_extension()
+const char* SFAudioWriter::get_extension()
 {
-       return "wav";
+       if (m_fileType == SF_FORMAT_WAV) {
+               return ".wav";
+       }
+       else if (m_fileType == SF_FORMAT_AIFF) {
+               return ".aiff";
+       }
+       else if (m_fileType == SF_FORMAT_FLAC) {
+               return ".flac";
+       }
+       return ".raw";
 }
 
 

Index: audiofileio/encode/SFAudioWriter.h
===================================================================
RCS file: /sources/traverso/traverso/src/audiofileio/encode/SFAudioWriter.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- audiofileio/encode/SFAudioWriter.h  11 Aug 2007 21:45:28 -0000      1.3
+++ audiofileio/encode/SFAudioWriter.h  13 Aug 2007 00:01:52 -0000      1.4
@@ -38,7 +38,7 @@
        ~SFAudioWriter();
        
        bool set_format_attribute(const QString& key, const QString& value);
-       const char* get_default_extension();
+       const char* get_extension();
        
 protected:
        bool open_private();

Index: audiofileio/encode/WPAudioWriter.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/audiofileio/encode/WPAudioWriter.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- audiofileio/encode/WPAudioWriter.cpp        12 Aug 2007 00:45:19 -0000      
1.2
+++ audiofileio/encode/WPAudioWriter.cpp        13 Aug 2007 00:01:52 -0000      
1.3
@@ -48,9 +48,9 @@
 }
 
 
-const char* WPAudioWriter::get_default_extension()
+const char* WPAudioWriter::get_extension()
 {
-       return "wv";
+       return ".wv";
 }
 
 

Index: audiofileio/encode/WPAudioWriter.h
===================================================================
RCS file: /sources/traverso/traverso/src/audiofileio/encode/WPAudioWriter.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- audiofileio/encode/WPAudioWriter.h  12 Aug 2007 00:45:19 -0000      1.2
+++ audiofileio/encode/WPAudioWriter.h  13 Aug 2007 00:01:52 -0000      1.3
@@ -37,7 +37,7 @@
        WPAudioWriter();
        ~WPAudioWriter();
        
-       const char* get_default_extension();
+       const char* get_extension();
        
 protected:
        bool open_private();

Index: traverso/ExportWidget.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/ExportWidget.cpp,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -b -r1.50 -r1.51
--- traverso/ExportWidget.cpp   4 Aug 2007 04:20:22 -0000       1.50
+++ traverso/ExportWidget.cpp   13 Aug 2007 00:01:52 -0000      1.51
@@ -79,6 +79,7 @@
        audioTypeComboBox->insertItem(0, "WAV");
        audioTypeComboBox->insertItem(1, "AIFF");
        audioTypeComboBox->insertItem(2, "FLAC");
+       audioTypeComboBox->insertItem(3, "WAVPACK");
 //     audioTypeComboBox->insertItem(3, "CD image (cdrdao)");
 
        bitdepthComboBox->setCurrentIndex(0);
@@ -182,17 +183,17 @@
         case   0:
                 m_exportSpec->writerType = "sf";
                 m_exportSpec->extraFormat["filetype"] = "wav";
-                m_exportSpec->extension = ".wav";
                 break;
         case   1:
                 m_exportSpec->writerType = "sf";
                 m_exportSpec->extraFormat["filetype"] = "aiff";
-                m_exportSpec->extension = ".aiff";
                 break;
         case   2:
                 m_exportSpec->writerType = "sf";
                 m_exportSpec->extraFormat["filetype"] = "flac";
-               m_exportSpec->extension = ".flac";
+                break;
+        case   3:
+                m_exportSpec->writerType = "wp";
                 break;
         }
 
@@ -528,7 +529,6 @@
                (m_exportSpec->allSongs == cdAllSongsButton->isChecked()) &&
                (m_exportSpec->normalize == cdNormalizeCheckBox->isChecked())) 
) {
                
-               m_exportSpec->extension = ".wav";
                m_exportSpec->data_width = 16;
                m_exportSpec->writerType = "sf";
                m_exportSpec->extraFormat["filetype"] = "wav";