[Traverso-commit] traverso/src core/MonoReader.cpp engine/AlsaDri...

[Remon Sijrier]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Remon Sijrier <r_sijrier>       07/05/14 18:05:29

Modified files:
        src/core       : MonoReader.cpp 
        src/engine     : AlsaDriver.cpp AudioDevice.cpp 
        src/traverso/dialogs/settings: Pages.cpp 
        src/traverso   : QuickDriverConfigWidget.cpp Traverso.cpp 

Log message:
        * fixed type in loading buffersize for audiocard
        * tiny bit more consistent naming for properties

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/MonoReader.cpp?cvsroot=traverso&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/traverso/src/engine/AlsaDriver.cpp?cvsroot=traverso&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/traverso/src/engine/AudioDevice.cpp?cvsroot=traverso&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/dialogs/settings/Pages.cpp?cvsroot=traverso&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/QuickDriverConfigWidget.cpp?cvsroot=traverso&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/Traverso.cpp?cvsroot=traverso&r1=1.41&r2=1.42

Patches:
Index: core/MonoReader.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/MonoReader.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- core/MonoReader.cpp 11 May 2007 13:09:23 -0000      1.6
+++ core/MonoReader.cpp 14 May 2007 18:05:28 -0000      1.7
@@ -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: MonoReader.cpp,v 1.6 2007/05/11 13:09:23 r_sijrier Exp $
+$Id: MonoReader.cpp,v 1.7 2007/05/14 18:05:28 r_sijrier Exp $
 */
 
 
@@ -388,7 +388,7 @@
        
        Q_ASSERT(m_clip);
 
-       float size = config().get_property("Hardware", "PreBufferSize", 
1.0).toDouble();
+       float size = config().get_property("Hardware", "readbuffersize", 
1.0).toDouble();
 
        if (m_isCompressedFile) {
                size *= 2;

Index: engine/AlsaDriver.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/engine/AlsaDriver.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- engine/AlsaDriver.cpp       19 Mar 2007 11:18:57 -0000      1.15
+++ engine/AlsaDriver.cpp       14 May 2007 18:05:28 -0000      1.16
@@ -20,7 +20,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: AlsaDriver.cpp,v 1.15 2007/03/19 11:18:57 r_sijrier Exp $
+$Id: AlsaDriver.cpp,v 1.16 2007/05/14 18:05:28 r_sijrier Exp $
 */
 
 
@@ -101,7 +101,7 @@
 
 int AlsaDriver::setup(bool capture, bool playback, const QString& pcmName)
 {
-       unsigned long user_nperiods = config().get_property("Hardware", 
"NumberOfPeriods", 2).toInt();
+       unsigned long user_nperiods = config().get_property("Hardware", 
"numberofperiods", 2).toInt();
        char *playback_pcm_name = pcmName.toAscii().data();
        char *capture_pcm_name = pcmName.toAscii().data();
        int shorts_first = false;

Index: engine/AudioDevice.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/engine/AudioDevice.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- engine/AudioDevice.cpp      24 Apr 2007 15:30:08 -0000      1.28
+++ engine/AudioDevice.cpp      14 May 2007 18:05:29 -0000      1.29
@@ -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.28 2007/04/24 15:30:08 r_sijrier Exp $
+$Id: AudioDevice.cpp,v 1.29 2007/05/14 18:05:29 r_sijrier Exp $
 */
 
 #include "AudioDevice.h"
@@ -143,6 +143,7 @@
        m_runAudioThread = false;
        driver = 0;
        audioThread = 0;
+       m_bufferSize = 1024;
        m_cpuTime = new RingBufferNPT<trav_time_t>(4096);
 
        m_driverType = tr("No Driver Loaded");
@@ -212,6 +213,7 @@
 
 void AudioDevice::set_buffer_size( nframes_t size )
 {
+       Q_ASSERT(size > 0);
        m_bufferSize = size;
 }
 
@@ -703,7 +705,7 @@
                // so something certainly did go wrong when starting the beast
                // Start the Null Driver to avoid problems with Tsar
                PERROR("Alsa/Jack AudioThread stopped, but we didn't ask for 
it! Something apparently did go wrong :-(");
-               set_parameters(44100, 1024, "Null Driver");
+               set_parameters(44100, m_bufferSize, "Null Driver");
        }
 }
 
@@ -723,7 +725,7 @@
                        info().critical(tr("The Jack server has been 
shutdown!"));
                        delete driver;
                        driver = 0;
-                       set_parameters(44100, 1024, "Null Driver");
+                       set_parameters(44100, m_bufferSize, "Null Driver");
                }
        }
 }

Index: traverso/dialogs/settings/Pages.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/dialogs/settings/Pages.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- traverso/dialogs/settings/Pages.cpp 14 May 2007 12:16:34 -0000      1.15
+++ traverso/dialogs/settings/Pages.cpp 14 May 2007 18:05:29 -0000      1.16
@@ -101,7 +101,7 @@
 void AudioDriverPage::save_config()
 {
        config().set_property("Hardware", "samplerate", 
m_driverConfigPage->rateComboBox->currentText());
-       config().set_property("Hardware", "bufferSize", 
+       config().set_property("Hardware", "buffersize", 
               
m_driverConfigPage->periodBufferSizesList.at(m_driverConfigPage->latencyComboBox->currentIndex()));
        
        config().set_property("Hardware", "drivertype", 
m_driverCombo->currentText());
@@ -121,7 +121,7 @@
        
 #if defined (ALSA_SUPPORT)
        int periods = m_alsadevices->periodsCombo->currentText().toInt();
-       config().set_property("Hardware", "NumberOfPeriods", periods);
+       config().set_property("Hardware", "numberofperiods", periods);
        int index = m_alsadevices->devicesCombo->currentIndex();
        config().set_property("Hardware", "carddevice", 
m_alsadevices->devicesCombo->itemData(index));
        
@@ -137,11 +137,11 @@
 void AudioDriverPage::reset_default_config()
 {
        config().set_property("Hardware", "samplerate", 44100);
-       config().set_property("Hardware", "bufferSize", 1024);
+       config().set_property("Hardware", "buffersize", 1024);
 #if defined (ALSA_SUPPORT)
        config().set_property("Hardware", "drivertype", "ALSA");
        config().set_property("Hardware", "carddevice", "hw:0");
-       config().set_property("Hardware", "NumberOfPeriods", 2);
+       config().set_property("Hardware", "numberofperiods", 2);
 #elif defined (JACK_SUPPORT)
        config().set_property("Hardware", "drivertype", "Jack");
 #else
@@ -201,7 +201,7 @@
        
 #if defined (ALSA_SUPPORT)
        m_alsadevices->devicesCombo->clear();
-       int periodsIndex = config().get_property("Hardware", "NumberOfPeriods", 
1).toInt();
+       int periodsIndex = config().get_property("Hardware", "numberofperiods", 
1).toInt();
        m_alsadevices->periodsCombo->setCurrentIndex(periodsIndex - 2);
        
        QString name;
@@ -282,8 +282,8 @@
        // The AlsaDriver retrieves it's periods number directly from config()
        // So there is no way to use the current selected one, other then
        // setting it now, and restoring it afterwards...
-       int currentperiods = config().get_property("Hardware", 
"NumberOfPeriods", 2).toInt();
-       config().set_property("Hardware", "NumberOfPeriods", periods);
+       int currentperiods = config().get_property("Hardware", 
"numberofperiods", 2).toInt();
+       config().set_property("Hardware", "numberofperiods", periods);
        
        if (driver == "ALSA") {
                int index = m_alsadevices->devicesCombo->currentIndex();
@@ -301,7 +301,7 @@
        audiodevice().set_parameters(rate, buffersize, driver, capture, 
playback, cardDevice);
        
 #if defined (ALSA_SUPPORT)
-       config().set_property("Hardware", "NumberOfPeriods", currentperiods);
+       config().set_property("Hardware", "numberofperiods", currentperiods);
 #endif
 }
 
@@ -799,19 +799,19 @@
 
 void DiskIOPage::load_config()
 {
-       double buffertime = config().get_property("Hardware", "PreBufferSize", 
1.0).toDouble();
+       double buffertime = config().get_property("Hardware", "readbuffersize", 
1.0).toDouble();
        m_config->bufferTimeSpinBox->setValue(buffertime);
 }
 
 void DiskIOPage::save_config()
 {
        double buffertime = m_config->bufferTimeSpinBox->value();
-       config().set_property("Hardware", "PreBufferSize", buffertime);
+       config().set_property("Hardware", "readbuffersize", buffertime);
 }
 
 void DiskIOPage::reset_default_config()
 {
-       config().set_property("Hardware", "PreBufferSize", 1.0);
+       config().set_property("Hardware", "readbuffersize", 1.0);
        load_config();
 }
 

Index: traverso/QuickDriverConfigWidget.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/QuickDriverConfigWidget.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- traverso/QuickDriverConfigWidget.cpp        17 Apr 2007 19:56:46 -0000      
1.8
+++ traverso/QuickDriverConfigWidget.cpp        14 May 2007 18:05:29 -0000      
1.9
@@ -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: QuickDriverConfigWidget.cpp,v 1.8 2007/04/17 19:56:46 r_sijrier Exp $
+$Id: QuickDriverConfigWidget.cpp,v 1.9 2007/05/14 18:05:29 r_sijrier Exp $
 */
 
 #include "QuickDriverConfigWidget.h"
@@ -90,7 +90,7 @@
        audiodevice().set_parameters(rate, bufSize, driver, capture, playback, 
cardDevice);
 
        config().set_property("Hardware", "samplerate", 
rateComboBox->currentText().toInt());
-       config().set_property("Hardware", "bufferSize", 
periodBufferSizesList.at(latencyComboBox->currentIndex()));
+       config().set_property("Hardware", "buffersize", 
periodBufferSizesList.at(latencyComboBox->currentIndex()));
        config().set_property("Hardware", "drivertype", 
driverComboBox->currentText());
 
        hide();

Index: traverso/Traverso.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/Traverso.cpp,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- traverso/Traverso.cpp       7 May 2007 10:31:21 -0000       1.41
+++ traverso/Traverso.cpp       14 May 2007 18:05:29 -0000      1.42
@@ -194,7 +194,7 @@
 void Traverso::prepare_audio_device( )
 {
        int rate = config().get_property("Hardware", "samplerate", 
44100).toInt();
-       int bufferSize = config().get_property("Hardware", "bufferSize", 
1024).toInt();
+       int bufferSize = config().get_property("Hardware", "buffersize", 
1024).toInt();
        QString driverType = config().get_property("Hardware", "drivertype", 
"ALSA").toString();
        QString cardDevice = config().get_property("Hardware", "carddevice", 
"hw:0").toString();
        bool capture = config().get_property("Hardware", "capture", 1).toInt();