[Traverso-commit] traverso/src core/AudioClip.cpp core/AudioClip....

[Remon Sijrier]

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

Modified files:
        src/core       : AudioClip.cpp AudioClip.h 
        src/traverso/widgets: ResourcesWidget.cpp ResourcesWidget.h 

Log message:
        * Update clipitems in resourceswidget when length of clip changes

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/AudioClip.cpp?cvsroot=traverso&r1=1.95&r2=1.96
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/AudioClip.h?cvsroot=traverso&r1=1.48&r2=1.49
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/widgets/ResourcesWidget.cpp?cvsroot=traverso&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/widgets/ResourcesWidget.h?cvsroot=traverso&r1=1.6&r2=1.7

Patches:
Index: core/AudioClip.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/AudioClip.cpp,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -b -r1.95 -r1.96
--- core/AudioClip.cpp  17 May 2007 19:15:49 -0000      1.95
+++ core/AudioClip.cpp  18 May 2007 11:11:55 -0000      1.96
@@ -346,11 +346,6 @@
        emit trackEndFrameChanged();
 }
 
-void AudioClip::set_blur(bool )
-{
-       emit stateChanged();
-}
-
 void AudioClip::set_fade_in(nframes_t b)
 {
        if (!fadeIn) {

Index: core/AudioClip.h
===================================================================
RCS file: /sources/traverso/traverso/src/core/AudioClip.h,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -b -r1.48 -r1.49
--- core/AudioClip.h    15 May 2007 20:15:14 -0000      1.48
+++ core/AudioClip.h    18 May 2007 11:11:56 -0000      1.49
@@ -75,7 +75,6 @@
        int init_recording(QByteArray bus);
        int process(nframes_t nframes, audio_sample_t* channelBuffer, uint 
channel);
        
-       void set_blur(bool stat);
        void set_track_start_frame(nframes_t newTrackFirstFrame);
        void set_name(const QString& name);
        void set_fade_in(nframes_t b);

Index: traverso/widgets/ResourcesWidget.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/widgets/ResourcesWidget.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- traverso/widgets/ResourcesWidget.cpp        17 May 2007 23:29:39 -0000      
1.19
+++ traverso/widgets/ResourcesWidget.cpp        18 May 2007 11:11:56 -0000      
1.20
@@ -272,20 +272,12 @@
        
                if (! sourceitem ) return;
        
-               QTreeWidgetItem* clipitem = new QTreeWidgetItem(sourceitem);
+               ClipTreeItem* clipitem = new ClipTreeItem(sourceitem, clip);
                m_clipindices.insert(clip->get_id(), clipitem);
        
-               QString start = frame_to_ms(clip->get_source_start_frame(), 
clip->get_rate());
-               QString end = frame_to_ms(clip->get_source_end_frame(), 
clip->get_rate());
-               
-               clipitem->setText(0, clip->get_name());
-               clipitem->setText(1, frame_to_ms(clip->get_length(), 
clip->get_rate()));
-               clipitem->setText(2, start);
-               clipitem->setText(3, end);
                clipitem->setData(0, Qt::UserRole, clip->get_id());
-               clipitem->setToolTip(0, clip->get_name() + "   " + start + " - 
" + end);
                
-               item = clipitem;
+               connect(clip, SIGNAL(positionChanged(Snappable*)), clipitem, 
SLOT(clip_state_changed()));
        }
        
        update_clip_state(clip);
@@ -327,18 +319,10 @@
 
 void ResourcesWidget::update_clip_state(AudioClip* clip)
 {
-       QTreeWidgetItem* item = m_clipindices.value(clip->get_id());
+       ClipTreeItem* item = m_clipindices.value(clip->get_id());
        Q_ASSERT(item);
        
-       if (resources_manager()->is_clip_in_use(clip->get_id())) {
-               for (int i=0; i<5; ++i) {
-                       item->setForeground(i, QColor(Qt::black));
-               }
-       } else {
-               for (int i=0; i<5; ++i) {
-                       item->setForeground(i, QColor(Qt::lightGray));
-               }
-       }
+       item->clip_state_changed();
        
        update_source_state(clip->get_readsource_id());
 }
@@ -359,3 +343,31 @@
        }
 }
 
+ClipTreeItem::ClipTreeItem(QTreeWidgetItem * parent, AudioClip * clip)
+       : QTreeWidgetItem(parent)
+       , m_clip(clip)
+{
+}
+
+void ClipTreeItem::clip_state_changed()
+{
+       if (resources_manager()->is_clip_in_use(m_clip->get_id())) {
+               for (int i=0; i<5; ++i) {
+                       setForeground(i, QColor(Qt::black));
+               }
+       } else {
+               for (int i=0; i<5; ++i) {
+                       setForeground(i, QColor(Qt::lightGray));
+               }
+       }
+       
+       QString start = frame_to_ms(m_clip->get_source_start_frame(), 
m_clip->get_rate());
+       QString end = frame_to_ms(m_clip->get_source_end_frame(), 
m_clip->get_rate());
+               
+       setText(0, m_clip->get_name());
+       setText(1, frame_to_ms(m_clip->get_length(), m_clip->get_rate()));
+       setText(2, start);
+       setText(3, end);
+       setToolTip(0, m_clip->get_name() + "   " + start + " - " + end);
+}
+

Index: traverso/widgets/ResourcesWidget.h
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/widgets/ResourcesWidget.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- traverso/widgets/ResourcesWidget.h  17 May 2007 21:38:16 -0000      1.6
+++ traverso/widgets/ResourcesWidget.h  18 May 2007 11:11:56 -0000      1.7
@@ -32,6 +32,22 @@
 class ReadSource;
 class QTreeWidgetItem;
 
+class ClipTreeItem : public QObject, public QTreeWidgetItem
+{
+       Q_OBJECT
+       
+public:
+       ClipTreeItem(QTreeWidgetItem* parent, AudioClip* clip);
+
+
+public slots:
+       void clip_state_changed();      
+
+private:
+       AudioClip* m_clip;
+};
+
+
 class ResourcesWidget : public QWidget, protected Ui::ResourcesWidget
 {
        Q_OBJECT
@@ -45,7 +61,7 @@
 private:
        Project* m_project;
        FileWidget* m_filewidget;
-       QHash<qint64, QTreeWidgetItem*> m_clipindices;
+       QHash<qint64, ClipTreeItem*> m_clipindices;
        QHash<qint64, QTreeWidgetItem*> m_sourceindices;
        
        void update_clip_state(AudioClip* clip);
@@ -67,4 +83,5 @@
        void remove_source(ReadSource* source);
 };
 
+
 #endif