[vlmc-devel] commit: Removing useless methods from TrackHandler. ( Hugo Beauzée-Luyssen )

git at videolan.org git at videolan.org
Thu Aug 26 23:03:11 CEST 2010


vlmc | branch: master | Hugo Beauzée-Luyssen <beauze.h at gmail.com> | Thu Aug 26 22:59:39 2010 +0200| [fbee7bf1697728ae1881a77fc3ae5e1bf40a67ce] | committer: Hugo Beauzée-Luyssen 

Removing useless methods from TrackHandler.

MainWorkflow is now clear of clip related methods, though many things
are probably broken, especially when it comes to undo/redo.
Nevertheless, things are much clearer now, and should be fixed way more
easily.

> http://git.videolan.org/gitweb.cgi/vlmc.git/?a=commit;h=fbee7bf1697728ae1881a77fc3ae5e1bf40a67ce
---

 src/Workflow/TrackHandler.cpp |   27 ---------------------------
 src/Workflow/TrackHandler.h   |    3 ---
 2 files changed, 0 insertions(+), 30 deletions(-)

diff --git a/src/Workflow/TrackHandler.cpp b/src/Workflow/TrackHandler.cpp
index 790b7e7..ee42867 100644
--- a/src/Workflow/TrackHandler.cpp
+++ b/src/Workflow/TrackHandler.cpp
@@ -112,33 +112,6 @@ TrackHandler::stop()
 }
 
 void
-TrackHandler::moveClip(const QUuid &clipUuid, unsigned int oldTrack,
-                                       unsigned int newTrack, qint64 startingFrame )
-{
-     Q_ASSERT( newTrack < m_trackCount && oldTrack < m_trackCount );
-
-    if ( oldTrack == newTrack )
-    {
-        //And now, just move the clip.
-        m_tracks[newTrack]->moveClip( clipUuid, startingFrame );
-    }
-    else
-    {
-        ClipWorkflow* cw = m_tracks[oldTrack]->removeClipWorkflow( clipUuid );
-        m_tracks[newTrack]->addClip( cw, startingFrame );
-    }
-}
-
-Clip*
-TrackHandler::removeClip( const QUuid& uuid, unsigned int trackId )
-{
-    Q_ASSERT( trackId < m_trackCount );
-
-    Clip* clip = m_tracks[trackId]->removeClip( uuid );
-    return clip;
-}
-
-void
 TrackHandler::muteTrack( unsigned int trackId )
 {
     m_tracks[trackId].deactivate();
diff --git a/src/Workflow/TrackHandler.h b/src/Workflow/TrackHandler.h
index 534e3ff..beb643e 100644
--- a/src/Workflow/TrackHandler.h
+++ b/src/Workflow/TrackHandler.h
@@ -56,9 +56,6 @@ class   TrackHandler : public QObject
                                            bool paused );
         qint64                  getClipPosition( const QUuid& uuid, unsigned int trackId ) const;
         void                    stop();
-        void                    moveClip( const QUuid& clipUuid, unsigned int oldTrack,
-                                          unsigned int newTrack, qint64 startingFrame );
-        Clip*                   removeClip( const QUuid& uuid, unsigned int trackId );
         void                    muteTrack( unsigned int trackId );
         void                    unmuteTrack( unsigned int trackId );
         ClipHelper              *getClipHelper( const QUuid& uuid, unsigned int trackId );



More information about the Vlmc-devel mailing list