[Traverso-commit] traverso/src core/Marker.cpp core/Marker.h core...

[Nicola Doebelin]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Nicola Doebelin <n_doebelin>    07/11/22 20:02:14

Modified files:
        src/core       : Marker.cpp Marker.h TimeLine.cpp TimeLine.h 
        src/traverso/dialogs: MarkerDialog.cpp 
        src/traverso/songcanvas: TimeLineView.cpp 

Log message:
        Marker dialog now updates when markers are changed in the timeline.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/Marker.cpp?cvsroot=traverso&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/Marker.h?cvsroot=traverso&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/TimeLine.cpp?cvsroot=traverso&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/TimeLine.h?cvsroot=traverso&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/dialogs/MarkerDialog.cpp?cvsroot=traverso&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/TimeLineView.cpp?cvsroot=traverso&r1=1.53&r2=1.54

Patches:
Index: core/Marker.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/Marker.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- core/Marker.cpp     5 Nov 2007 15:49:30 -0000       1.15
+++ core/Marker.cpp     22 Nov 2007 20:02:14 -0000      1.16
@@ -116,6 +116,11 @@
        return 1;
 }
 
+void Marker::was_updated()
+{
+       emit wasDragged(this);
+}
+
 void Marker::set_when(const TimeRef& when)
 {
        m_when = when;

Index: core/Marker.h
===================================================================
RCS file: /sources/traverso/traverso/src/core/Marker.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- core/Marker.h       26 Sep 2007 20:46:32 -0000      1.13
+++ core/Marker.h       22 Nov 2007 20:02:14 -0000      1.14
@@ -49,6 +49,8 @@
        QDomNode get_state(QDomDocument doc);
        int set_state(const QDomNode& node);
        
+       void was_updated();
+       
        void set_when (const TimeRef& when);
        void set_description(const QString &);
        void set_performer(const QString &);
@@ -90,6 +92,7 @@
 signals:
        void positionChanged(Snappable*);
        void descriptionChanged();
+       void wasDragged(Marker*);
 
 };
 

Index: core/TimeLine.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/TimeLine.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- core/TimeLine.cpp   22 Nov 2007 14:46:59 -0000      1.10
+++ core/TimeLine.cpp   22 Nov 2007 20:02:14 -0000      1.11
@@ -57,6 +57,7 @@
        while (!markerNode.isNull()) {
                Marker* marker = new Marker(this, markerNode);
                m_markers.append(marker);
+               connect(marker, SIGNAL(wasDragged(Marker*)), this, 
SLOT(marker_dragged(Marker*)));
                markerNode = markerNode.nextSibling();
        }
 
@@ -100,6 +101,7 @@
 void TimeLine::private_add_marker(Marker * marker)
 {
        m_markers.append(marker);
+       connect(marker, SIGNAL(wasDragged(Marker*)), this, 
SLOT(marker_dragged(Marker*)));
 }
 
 void TimeLine::private_remove_marker(Marker * marker)
@@ -169,3 +171,8 @@
        return false;
 }
 
+void TimeLine::marker_dragged(Marker *marker)
+{
+       emit markerDragged(marker);
+}
+

Index: core/TimeLine.h
===================================================================
RCS file: /sources/traverso/traverso/src/core/TimeLine.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- core/TimeLine.h     22 Nov 2007 14:46:59 -0000      1.8
+++ core/TimeLine.h     22 Nov 2007 20:02:14 -0000      1.9
@@ -58,10 +58,12 @@
 private slots:
        void private_add_marker(Marker* marker);
        void private_remove_marker(Marker* marker);
+       void marker_dragged(Marker* marker);
 
 signals:
        void markerAdded(Marker*);
        void markerRemoved(Marker*);
+       void markerDragged(Marker*);
 };
 
 #endif

Index: traverso/dialogs/MarkerDialog.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/dialogs/MarkerDialog.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- traverso/dialogs/MarkerDialog.cpp   5 Nov 2007 15:53:03 -0000       1.13
+++ traverso/dialogs/MarkerDialog.cpp   22 Nov 2007 20:02:14 -0000      1.14
@@ -112,6 +112,9 @@
        m_songlist = m_project->get_songs();
        for (int i = 0; i < m_songlist.size(); ++i) {
                comboBoxDisplaySong->addItem(m_songlist.at(i)->get_title());
+               connect(m_songlist.at(i)->get_timeline(), 
SIGNAL(markerAdded(Marker*)), this, SLOT(update_marker_treeview()));
+               connect(m_songlist.at(i)->get_timeline(), 
SIGNAL(markerRemoved(Marker*)), this, SLOT(update_marker_treeview()));
+               connect(m_songlist.at(i)->get_timeline(), 
SIGNAL(markerDragged(Marker*)), this, SLOT(update_marker_treeview()));
        }
 
        // Fill dialog with marker stuff....

Index: traverso/songcanvas/TimeLineView.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/songcanvas/TimeLineView.cpp,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -b -r1.53 -r1.54
--- traverso/songcanvas/TimeLineView.cpp        5 Nov 2007 15:49:32 -0000       
1.53
+++ traverso/songcanvas/TimeLineView.cpp        22 Nov 2007 20:02:14 -0000      
1.54
@@ -89,6 +89,7 @@
 int DragMarker::do_action()
 {
        m_marker->set_when(m_newWhen);
+       m_marker->was_updated();
        return 1;
 }