[Traverso-commit] traverso/src core/WriteSource.cpp traverso/Expo...

[Ben Levitt]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Ben Levitt <benjie>     07/05/03 20:05:07

Modified files:
        src/core       : WriteSource.cpp 
        src/traverso   : ExportWidget.cpp 

Log message:
        add 8k,11k, and 8bit as new export options

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/WriteSource.cpp?cvsroot=traverso&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/ExportWidget.cpp?cvsroot=traverso&r1=1.10&r2=1.11

Patches:
Index: core/WriteSource.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/WriteSource.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- core/WriteSource.cpp        3 May 2007 10:38:29 -0000       1.19
+++ core/WriteSource.cpp        3 May 2007 20:05:07 -0000       1.20
@@ -214,8 +214,7 @@
 
                switch (spec->data_width) {
                case 8:
-                       /* XXXX no way to deliver 8 bit audio to libsndfile */
-                       written = to_write;
+                       written = sf_write_raw (sf, (void*) output_data, 
to_write * channels);
                        break;
 
                case 16:

Index: traverso/ExportWidget.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/ExportWidget.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- traverso/ExportWidget.cpp   3 May 2007 18:12:07 -0000       1.10
+++ traverso/ExportWidget.cpp   3 May 2007 20:05:07 -0000       1.11
@@ -62,42 +62,52 @@
                 connect(m_project, SIGNAL(exportStartedForSong(Song*)), this, 
SLOT (set_exporting_song(Song*)));
         }
 
-        bitdepthComboBox->insertItem(0, "16");
-        bitdepthComboBox->insertItem(1, "24");
-        bitdepthComboBox->insertItem(2, "32");
-        bitdepthComboBox->insertItem(3, "32 (float)");
+        bitdepthComboBox->insertItem(0, "8");
+        bitdepthComboBox->insertItem(1, "16");
+        bitdepthComboBox->insertItem(2, "24");
+        bitdepthComboBox->insertItem(3, "32");
+        bitdepthComboBox->insertItem(4, "32 (float)");
 
         channelComboBox->insertItem(0, "Stereo");
         channelComboBox->insertItem(1, "Mono");
 
-        sampleRateComboBox->insertItem(0, "22.050 Hz");
-        sampleRateComboBox->insertItem(1, "44.100 Hz");
-        sampleRateComboBox->insertItem(2, "48.000 Hz");
-        sampleRateComboBox->insertItem(3, "88.200 Hz");
-        sampleRateComboBox->insertItem(4, "96.000 Hz");
+        sampleRateComboBox->insertItem(0, "8.000 Hz");
+        sampleRateComboBox->insertItem(1, "11.025 Hz");
+        sampleRateComboBox->insertItem(2, "22.050 Hz");
+        sampleRateComboBox->insertItem(3, "44.100 Hz");
+        sampleRateComboBox->insertItem(4, "48.000 Hz");
+        sampleRateComboBox->insertItem(5, "88.200 Hz");
+        sampleRateComboBox->insertItem(6, "96.000 Hz");
 
        audioTypeComboBox->insertItem(0, "WAV");
        audioTypeComboBox->insertItem(1, "AIFF");
        audioTypeComboBox->insertItem(2, "FLAC");
        audioTypeComboBox->insertItem(3, "CD image (cdrdao)");
 
+       bitdepthComboBox->setCurrentIndex(1);
 
         switch(audiodevice().get_sample_rate()) {
-        case           22050:
+        case           8000:
                 sampleRateComboBox->setCurrentIndex(0);
                 break;
-        case           44100:
+        case           11025:
                 sampleRateComboBox->setCurrentIndex(1);
                 break;
-        case           48000:
+        case           22050:
                 sampleRateComboBox->setCurrentIndex(2);
                 break;
-        case           88200:
+        case           44100:
                 sampleRateComboBox->setCurrentIndex(3);
                 break;
-        case           96000:
+        case           48000:
                 sampleRateComboBox->setCurrentIndex(4);
                 break;
+        case           88200:
+                sampleRateComboBox->setCurrentIndex(5);
+                break;
+        case           96000:
+                sampleRateComboBox->setCurrentIndex(6);
+                break;
         }
 
         show_settings_view();
@@ -162,18 +172,22 @@
 
             switch (bitdepthComboBox->currentIndex()) {
                case            0:
+                       spec->data_width = 8;
+                       spec->format |= SF_FORMAT_PCM_U8;
+                       break;
+               case            1:
                        spec->data_width = 16;
                        spec->format |= SF_FORMAT_PCM_16;
                        break;
-               case            1:
+               case            2:
                        spec->data_width = 24;
                        spec->format |= SF_FORMAT_PCM_24;
                        break;
-               case            2:
+               case            3:
                        spec->data_width = 32;
                        spec->format |= SF_FORMAT_PCM_32;
                        break;
-               case            3:
+               case            4:
                        spec->data_width = 1;   // 1 means float
                        spec->format |= SF_FORMAT_FLOAT;
                        break;
@@ -190,18 +204,24 @@
        
                switch (sampleRateComboBox->currentIndex()) {
                case            0:
-                       spec->sample_rate = 22050;
+                       spec->sample_rate = 8000;
                        break;
                case            1:
-                       spec->sample_rate = 44100;
+                       spec->sample_rate = 11025;
                        break;
                case            2:
-                       spec->sample_rate = 48000;
+                       spec->sample_rate = 22050;
                        break;
                case            3:
-                       spec->sample_rate = 88200;
+                       spec->sample_rate = 44100;
                        break;
                case            4:
+                       spec->sample_rate = 48000;
+                       break;
+               case            5:
+                       spec->sample_rate = 88200;
+                       break;
+               case            6:
                        spec->sample_rate = 96000;
                        break;
                }