[Traverso-commit] traverso resources/themes/default/traversotheme...

[Remon Sijrier]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Remon Sijrier <r_sijrier>       07/05/15 11:25:43

Modified files:
        resources/themes/default: traversotheme.xml 
        src/commands   : PlayHeadMove.cpp PlayHeadMove.h 
        src/traverso/dialogs/settings: Pages.cpp 

Log message:
        * keep audio in sync is disabled by default
        * tiny improvement in playhead move, when sync is enabled

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/resources/themes/default/traversotheme.xml?cvsroot=traverso&r1=1.32&r2=1.33
http://cvs.savannah.gnu.org/viewcvs/traverso/src/commands/PlayHeadMove.cpp?cvsroot=traverso&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/traverso/src/commands/PlayHeadMove.h?cvsroot=traverso&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/dialogs/settings/Pages.cpp?cvsroot=traverso&r1=1.17&r2=1.18

Patches:
Index: resources/themes/default/traversotheme.xml
===================================================================
RCS file: 
/sources/traverso/traverso/resources/themes/default/traversotheme.xml,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- resources/themes/default/traversotheme.xml  14 May 2007 23:35:15 -0000      
1.32
+++ resources/themes/default/traversotheme.xml  15 May 2007 11:25:42 -0000      
1.33
@@ -66,7 +66,7 @@
                <color name="AudioClip:background:selected"  red="101" 
green="111" blue="171"  alpha="170" />
                <color name="AudioClip:background:selected:mousehover"  
red="111" green="121" blue="182"  alpha="170" />
                <color name="AudioClip:background"  red="249" green="249" 
blue="255"  alpha="170" />
-               <color name="AudioClip:background:mousehover"  red="255" 
green="255" blue="255"  alpha="160" />
+               <color name="AudioClip:background:mousehover"  red="255" 
green="255" blue="255"  alpha="170" />
                <color name="AudioClip:channelseperator"  red="178" green="191" 
blue="182"  alpha="255" />
                <color name="AudioClip:channelseperator:selected"  red="24" 
green="137" blue="210"  alpha="255" />
                <color name="AudioClip:contour"  red="50" green="50" blue="50"  
alpha="150" />

Index: src/commands/PlayHeadMove.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/commands/PlayHeadMove.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- src/commands/PlayHeadMove.cpp       8 May 2007 22:13:40 -0000       1.6
+++ src/commands/PlayHeadMove.cpp       15 May 2007 11:25:42 -0000      1.7
@@ -57,7 +57,7 @@
 {
        m_cursor->show();
        m_cursor->set_active(false);
-       m_origXPos = m_song->get_transport_frame() / m_sv->scalefactor;
+       m_origXPos = m_newXPos = m_song->get_transport_frame() / 
m_sv->scalefactor;
        m_sv->start_shuttle(true, true);
        return 1;
 }
@@ -86,6 +86,12 @@
        if (x < 0) {
                x = 0;
        }
+       if (x == m_newXPos) {
+               return 0;
+       }
+       
+       m_newXPos = x;
+       
        m_cursor->setPos(x, 0);
        
        nframes_t newpos = (nframes_t) (x * m_sv->scalefactor);

Index: src/commands/PlayHeadMove.h
===================================================================
RCS file: /sources/traverso/traverso/src/commands/PlayHeadMove.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- src/commands/PlayHeadMove.h 13 Apr 2007 11:12:30 -0000      1.2
+++ src/commands/PlayHeadMove.h 15 May 2007 11:25:42 -0000      1.3
@@ -47,6 +47,7 @@
        SongView*       m_sv;
        bool            m_resync;
        int             m_origXPos;
+       int             m_newXPos;
 };
 
 #endif

Index: src/traverso/dialogs/settings/Pages.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/dialogs/settings/Pages.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- src/traverso/dialogs/settings/Pages.cpp     14 May 2007 23:43:50 -0000      
1.17
+++ src/traverso/dialogs/settings/Pages.cpp     15 May 2007 11:25:43 -0000      
1.18
@@ -436,7 +436,7 @@
        QString oncloseaction = config().get_property("Project", "onclose", 
"save").toString();
        int defaultNumTracks = config().get_property("Song", 
"trackCreationCount", 6).toInt();
        int scrollMode = config().get_property("PlayHead", "Scrollmode", 
2).toInt();
-       bool resyncAudio = config().get_property("AudioClip", "SyncDuringDrag", 
true).toBool();
+       bool resyncAudio = config().get_property("AudioClip", "SyncDuringDrag", 
false).toBool();
        
        m_configpage->projectDirLineEdit->setText(dir);
        m_configpage->loadLastProjectCheckBox->setChecked(loadLastUsedProject);