[Traverso-commit] traverso/src core/Config.cpp engine/AlsaDriver....

[Remon Sijrier]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Remon Sijrier <r_sijrier>       07/12/03 16:24:20

Modified files:
        src/core       : Config.cpp 
        src/engine     : AlsaDriver.cpp 
        src/traverso/dialogs/settings: Pages.cpp 
        src/traverso/widgets: InfoWidgets.cpp 

Log message:
        * change default to num periods = 3, frames = 512.
        This should get everyone going, even with crappy chipsets

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/Config.cpp?cvsroot=traverso&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/traverso/src/engine/AlsaDriver.cpp?cvsroot=traverso&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/dialogs/settings/Pages.cpp?cvsroot=traverso&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/widgets/InfoWidgets.cpp?cvsroot=traverso&r1=1.51&r2=1.52

Patches:
Index: core/Config.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/Config.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- core/Config.cpp     5 Nov 2007 15:49:29 -0000       1.18
+++ core/Config.cpp     3 Dec 2007 16:24:20 -0000       1.19
@@ -137,7 +137,7 @@
 {
        QHash<QString, QVariant> hardwareconfigs;
        hardwareconfigs.insert("jackslave", get_property("Hardware", 
"jackslave", false));
-       hardwareconfigs.insert("numberofperiods", get_property("Hardware", 
"numberofperiods", 2));
+       hardwareconfigs.insert("numberofperiods", get_property("Hardware", 
"numberofperiods", 3));
        
        audiodevice().set_driver_properties(hardwareconfigs);
 }

Index: engine/AlsaDriver.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/engine/AlsaDriver.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- engine/AlsaDriver.cpp       20 Oct 2007 17:38:18 -0000      1.18
+++ engine/AlsaDriver.cpp       3 Dec 2007 16:24:20 -0000       1.19
@@ -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.18 2007/10/20 17:38:18 r_sijrier Exp $
+$Id: AlsaDriver.cpp,v 1.19 2007/12/03 16:24:20 r_sijrier Exp $
 */
 
 
@@ -100,7 +100,7 @@
 
 int AlsaDriver::setup(bool capture, bool playback, const QString& pcmName)
 {
-       unsigned long user_nperiods = 
device->get_driver_property("numberofperiods", 2).toInt();
+       unsigned long user_nperiods = 
device->get_driver_property("numberofperiods", 3).toInt();
        char *playback_pcm_name = pcmName.toAscii().data();
        char *capture_pcm_name = pcmName.toAscii().data();
        int shorts_first = false;

Index: traverso/dialogs/settings/Pages.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/dialogs/settings/Pages.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- traverso/dialogs/settings/Pages.cpp 22 Nov 2007 18:27:05 -0000      1.28
+++ traverso/dialogs/settings/Pages.cpp 3 Dec 2007 16:24:20 -0000       1.29
@@ -152,11 +152,11 @@
 void AudioDriverPage::reset_default_config()
 {
        config().set_property("Hardware", "samplerate", 44100);
-       config().set_property("Hardware", "buffersize", 1024);
+       config().set_property("Hardware", "buffersize", 512);
 #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", 3);
 #elif defined (JACK_SUPPORT)
        if (libjack_is_present)
                config().set_property("Hardware", "drivertype", "Jack");
@@ -187,7 +187,7 @@
 void AudioDriverPage::load_config( )
 {
        int samplerate = config().get_property("Hardware", "samplerate", 
44100).toInt();
-       int buffersize = config().get_property("Hardware", "buffersize", 
1024).toInt();
+       int buffersize = config().get_property("Hardware", "buffersize", 
512).toInt();
 #if defined (Q_WS_X11)
        QString driverType = config().get_property("Hardware", "drivertype", 
"ALSA").toString();
 #else
@@ -223,7 +223,7 @@
        
 #if defined (ALSA_SUPPORT)
        m_alsadevices->devicesCombo->clear();
-       int periodsIndex = config().get_property("Hardware", "numberofperiods", 
2).toInt();
+       int periodsIndex = config().get_property("Hardware", "numberofperiods", 
3).toInt();
        m_alsadevices->periodsCombo->setCurrentIndex(periodsIndex - 2);
        
        QString name;
@@ -307,7 +307,7 @@
        // 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();
+       int currentperiods = config().get_property("Hardware", 
"numberofperiods", 3).toInt();
        config().set_property("Hardware", "numberofperiods", periods);
        
        if (driver == "ALSA") {

Index: traverso/widgets/InfoWidgets.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/widgets/InfoWidgets.cpp,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -b -r1.51 -r1.52
--- traverso/widgets/InfoWidgets.cpp    30 Nov 2007 19:58:08 -0000      1.51
+++ traverso/widgets/InfoWidgets.cpp    3 Dec 2007 16:24:20 -0000       1.52
@@ -678,6 +678,10 @@
 
 void SongInfo::update_effects_state()
 {
+       if (!m_song) {
+               return;
+       }
+       
        if (m_song->get_mode() == Song::EDIT) {
                m_effectButton->setChecked(false);
        } else {
@@ -708,6 +712,10 @@
 
 void SongInfo::follow_state_changed(bool state)
 {
+       if (!m_song) {
+               return;
+       }
+       
        if (!m_song->is_transport_rolling() || !m_isFollowing) {
                m_isFollowing = state;
                config().set_property("PlayHead", "Follow", state);