[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Traverso-commit] traverso/src/traverso/widgets InfoWidgets.cpp I...
From: |
Ben Levitt |
Subject: |
[Traverso-commit] traverso/src/traverso/widgets InfoWidgets.cpp I... |
Date: |
Sun, 03 Jun 2007 17:14:18 +0000 |
CVSROOT: /sources/traverso
Module name: traverso
Changes by: Ben Levitt <benjie> 07/06/03 17:14:18
Modified files:
src/traverso/widgets: InfoWidgets.cpp InfoWidgets.h
Log message:
make follow playhead button work as expected when transport starts
while follow is turned off.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/widgets/InfoWidgets.cpp?cvsroot=traverso&r1=1.37&r2=1.38
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/widgets/InfoWidgets.h?cvsroot=traverso&r1=1.18&r2=1.19
Patches:
Index: InfoWidgets.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/widgets/InfoWidgets.cpp,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- InfoWidgets.cpp 2 Jun 2007 23:02:33 -0000 1.37
+++ InfoWidgets.cpp 3 Jun 2007 17:14:17 -0000 1.38
@@ -665,21 +665,26 @@
void SongInfo::update_follow_state()
{
- m_followAct->setChecked(config().get_property("PlayHead", "Follow",
true).toBool());
+ m_isFollowing = config().get_property("PlayHead", "Follow",
true).toBool();
+ m_followAct->setChecked(m_isFollowing);
}
void SongInfo::update_temp_follow_state(bool state)
{
- if (m_song->is_transporting()) {
+ if (m_song->is_transporting() && m_isFollowing) {
m_followAct->setChecked(state);
}
}
void SongInfo::follow_state_changed(bool state)
{
- if (!m_song->is_transporting()) {
+ if (!m_song->is_transporting() || !m_isFollowing) {
+ m_isFollowing = state;
config().set_property("PlayHead", "Follow", state);
config().save();
+ if (m_song->is_transporting()) {
+ m_song->set_temp_follow_state(state);
+ }
} else {
m_song->set_temp_follow_state(state);
}
Index: InfoWidgets.h
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/widgets/InfoWidgets.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- InfoWidgets.h 2 Jun 2007 23:02:33 -0000 1.18
+++ InfoWidgets.h 3 Jun 2007 17:14:17 -0000 1.19
@@ -211,6 +211,7 @@
QAction* m_followAct;
QAction* m_recAction;
QToolButton* m_record;
+ bool m_isFollowing;
};
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Traverso-commit] traverso/src/traverso/widgets InfoWidgets.cpp I...,
Ben Levitt <=