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

[Remon Sijrier]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Remon Sijrier <r_sijrier>       07/04/26 18:57:57

Modified files:
        src/core       : AudioClip.cpp AudioClip.h ReadSource.h 
                         ResourcesManager.cpp ResourcesManager.h 
        src/traverso   : PluginSelectorDialog.cpp PluginSelectorDialog.h 
        src/traverso/songcanvas: ClipsViewPort.cpp TrackView.cpp 
        src/traverso/ui: PluginSelectorDialog.ui 

Log message:
        * Resources Bin D&D basically works now
        * Minor Plugin Selector dialog improvement

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/AudioClip.cpp?cvsroot=traverso&r1=1.81&r2=1.82
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/AudioClip.h?cvsroot=traverso&r1=1.43&r2=1.44
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/ReadSource.h?cvsroot=traverso&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/ResourcesManager.cpp?cvsroot=traverso&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/ResourcesManager.h?cvsroot=traverso&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/PluginSelectorDialog.cpp?cvsroot=traverso&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/PluginSelectorDialog.h?cvsroot=traverso&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/ClipsViewPort.cpp?cvsroot=traverso&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/TrackView.cpp?cvsroot=traverso&r1=1.30&r2=1.31
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/ui/PluginSelectorDialog.ui?cvsroot=traverso&r1=1.3&r2=1.4

Patches:
Index: core/AudioClip.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/AudioClip.cpp,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -b -r1.81 -r1.82
--- core/AudioClip.cpp  26 Apr 2007 13:46:42 -0000      1.81
+++ core/AudioClip.cpp  26 Apr 2007 18:57:57 -0000      1.82
@@ -991,5 +991,13 @@
        return m_domNode;
 }
 
+bool AudioClip::has_song() const
+{
+       if (m_song) {
+               return true;
+       }
+       return false;
+}
+
 // eof
 

Index: core/AudioClip.h
===================================================================
RCS file: /sources/traverso/traverso/src/core/AudioClip.h,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -b -r1.43 -r1.44
--- core/AudioClip.h    23 Apr 2007 11:48:37 -0000      1.43
+++ core/AudioClip.h    26 Apr 2007 18:57:57 -0000      1.44
@@ -117,6 +117,7 @@
        bool is_muted() const;
        bool is_take() const;
        bool is_selected() const;
+       bool has_song() const;
        int recording_state() const;
 
        static bool smaller(const AudioClip* left, const AudioClip* right )

Index: core/ReadSource.h
===================================================================
RCS file: /sources/traverso/traverso/src/core/ReadSource.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- core/ReadSource.h   29 Mar 2007 11:09:38 -0000      1.17
+++ core/ReadSource.h   26 Apr 2007 18:57:57 -0000      1.18
@@ -17,7 +17,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: ReadSource.h,v 1.17 2007/03/29 11:09:38 r_sijrier Exp $
+$Id: ReadSource.h,v 1.18 2007/04/26 18:57:57 r_sijrier Exp $
 */
 
 #ifndef READSOURCE_H
@@ -44,6 +44,7 @@
        int file_read(int channel, audio_sample_t* dst, nframes_t start, 
nframes_t cnt) const;
 
        int init();
+       int get_ref_count() const {return m_refcount;}
        void set_active(bool active);
        void set_was_recording(bool wasRecording);
        

Index: core/ResourcesManager.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/ResourcesManager.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- core/ResourcesManager.cpp   24 Apr 2007 23:57:10 -0000      1.6
+++ core/ResourcesManager.cpp   26 Apr 2007 18:57:57 -0000      1.7
@@ -231,6 +231,8 @@
                source = 0;
        }
        
+       emit stateChanged();
+       
        return source;
 }
 
@@ -298,11 +300,15 @@
        if (source) {
                clip->set_audio_source(source);
        } else {
-               info().critical(
+               // sometimes the source is set later...
+               // maybe that should become the default ?
+/*             info().critical(
                     tr("ResourcesManager: AudioClip %1 required ReadSource 
with ID %2, but I don't have it!!")
-                       .arg(clip->get_name()).arg(clip->get_readsource_id()));
+                       
.arg(clip->get_name()).arg(clip->get_readsource_id()));*/
        }
        
+       emit stateChanged();
+       
        return clip;
 }
 

Index: core/ResourcesManager.h
===================================================================
RCS file: /sources/traverso/traverso/src/core/ResourcesManager.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- core/ResourcesManager.h     25 Apr 2007 13:45:18 -0000      1.4
+++ core/ResourcesManager.h     26 Apr 2007 18:57:57 -0000      1.5
@@ -81,6 +81,7 @@
 signals:
        void sourceAdded();
        void sourceRemoved();
+       void stateChanged();
 };
 
 

Index: traverso/PluginSelectorDialog.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/PluginSelectorDialog.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- traverso/PluginSelectorDialog.cpp   25 Apr 2007 17:49:24 -0000      1.8
+++ traverso/PluginSelectorDialog.cpp   26 Apr 2007 18:57:57 -0000      1.9
@@ -128,4 +128,10 @@
        return plugin;
 }
 
+void PluginSelectorDialog::set_description(const QString & des)
+{
+       objectToAddPluginTooLabel->setText(des);
+}
+
 //eof
+

Index: traverso/PluginSelectorDialog.h
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/PluginSelectorDialog.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- traverso/PluginSelectorDialog.h     25 Apr 2007 17:49:24 -0000      1.2
+++ traverso/PluginSelectorDialog.h     26 Apr 2007 18:57:57 -0000      1.3
@@ -36,6 +36,7 @@
        static PluginSelectorDialog* instance();
        
        Plugin* get_selected_plugin();
+       void set_description(const QString& des);
 
 private:
        PluginSelectorDialog(QWidget* parent = 0);

Index: traverso/songcanvas/ClipsViewPort.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/songcanvas/ClipsViewPort.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- traverso/songcanvas/ClipsViewPort.cpp       25 Apr 2007 15:58:50 -0000      
1.14
+++ traverso/songcanvas/ClipsViewPort.cpp       26 Apr 2007 18:57:57 -0000      
1.15
@@ -17,7 +17,6 @@
 along with this program; if not, write to the Free Software
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA.
 
-$Id: ClipsViewPort.cpp,v 1.14 2007/04/25 15:58:50 r_sijrier Exp $
 */
 
 #include "ClipsViewPort.h"
@@ -72,7 +71,7 @@
 //     printf("ClipsViewPort::paintEvent\n");
        QGraphicsView::paintEvent(e);
 }
-#include <QModelIndex>
+
 
 void ClipsViewPort::dragEnterEvent( QDragEnterEvent * event )
 {
@@ -139,14 +138,34 @@
        CommandGroup* group = new CommandGroup(m_sw->get_song(), 
                       tr("Import %n audiofile(s)", "", m_imports.size() + 
m_resourcesImport.size()), true);
        
-       
+       nframes_t startpos = 0;
+       if (AudioClip* lastClip = importTrack->get_cliplist().get_last()) {
+               startpos = lastClip->get_track_end_frame();
+       }
        foreach(qint64 id, m_resourcesImport) {
                AudioClip* clip = resources_manager()->get_clip(id);
                if (clip) {
+                       bool hadSong = clip->has_song();
                        clip->set_song(m_sw->get_song());
                        clip->set_track(importTrack);
-//                     clip->set_state(clip->get_dom_node());
-                       clip->set_track_start_frame(0);
+                       if (!hadSong) {
+                               clip->set_state(clip->get_dom_node());
+                       }
+                       clip->set_track_start_frame(startpos);
+                       startpos = clip->get_track_end_frame();
+                       group->add_command(importTrack->add_clip(clip));
+                       continue;
+               }
+               ReadSource* source = resources_manager()->get_readsource(id);
+               if (source) {
+                       clip = 
resources_manager()->new_audio_clip(source->get_name());
+                       clip->set_audio_source(source);
+                       clip->set_song(importTrack->get_song());
+                       clip->set_track(importTrack);
+                       clip->set_track_start_frame(startpos);
+                       startpos = clip->get_track_end_frame();
+                       // FIXME!!!!!!!!!!!!!!!!!!!!
+                       clip->init_gain_envelope();
                        group->add_command(importTrack->add_clip(clip));
                }
        }

Index: traverso/songcanvas/TrackView.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/songcanvas/TrackView.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- traverso/songcanvas/TrackView.cpp   25 Apr 2007 13:45:18 -0000      1.30
+++ traverso/songcanvas/TrackView.cpp   26 Apr 2007 18:57:57 -0000      1.31
@@ -163,6 +163,9 @@
 
 Command* TrackView::add_new_plugin( )
 {
+       PluginSelectorDialog::instance()->set_description(tr("Track %1:  %2")
+                       
.arg(m_track->get_sort_index()+1).arg(m_track->get_name()));
+       
        if (PluginSelectorDialog::instance()->exec() == QDialog::Accepted) {
                Plugin* plugin = 
PluginSelectorDialog::instance()->get_selected_plugin();
                if (plugin) {

Index: traverso/ui/PluginSelectorDialog.ui
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/ui/PluginSelectorDialog.ui,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- traverso/ui/PluginSelectorDialog.ui 25 Apr 2007 21:23:40 -0000      1.3
+++ traverso/ui/PluginSelectorDialog.ui 26 Apr 2007 18:57:57 -0000      1.4
@@ -6,7 +6,7 @@
     <x>0</x>
     <y>0</y>
     <width>432</width>
-    <height>357</height>
+    <height>414</height>
    </rect>
   </property>
   <property name="windowTitle" >
@@ -20,6 +20,13 @@
     <number>6</number>
    </property>
    <item>
+    <widget class="QLabel" name="objectToAddPluginTooLabel" >
+     <property name="text" >
+      <string>Add Plugin too</string>
+     </property>
+    </widget>
+   </item>
+   <item>
     <widget class="QTreeWidget" name="pluginTreeWidget" >
      <column>
       <property name="text" >