[Traverso-commit] traverso/src/traverso Interface.cpp Interface.h

[Ben Levitt]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Ben Levitt <benjie>     07/04/29 05:54:17

Modified files:
        src/traverso   : Interface.cpp Interface.h 

Log message:
        adds Import Audio to Song Menu.  Adds stub for Insert Silence :)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/Interface.cpp?cvsroot=traverso&r1=1.69&r2=1.70
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/Interface.h?cvsroot=traverso&r1=1.31&r2=1.32

Patches:
Index: Interface.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/Interface.cpp,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -b -r1.69 -r1.70
--- Interface.cpp       25 Apr 2007 15:58:49 -0000      1.69
+++ Interface.cpp       29 Apr 2007 05:54:17 -0000      1.70
@@ -43,6 +43,7 @@
 #include "SpectralMeterWidget.h"
                
                
+#include "Import.h"
 #include "songcanvas/SongWidget.h"
 
 #include "dialogs/settings/SettingsDialog.h"
@@ -381,6 +382,14 @@
        action = menu->addAction(tr("New &Song(s)..."));
        connect(action, SIGNAL(triggered()), this, SLOT(show_newsong_dialog()));
 
+       menu->addSeparator();
+
+       action = menu->addAction(tr("Import &Audio..."));
+       connect(action, SIGNAL(triggered()), this, SLOT(import_audio()));
+       action = menu->addAction(tr("Insert Si&lence..."));
+       action->setDisabled(true);
+       connect(action, SIGNAL(triggered()), this, SLOT(insert_silence()));
+       
        
        menu = menuBar()->addMenu(tr("&View"));
 
@@ -710,7 +719,27 @@
        foreach(SongWidget* widget, m_songWidgets) {
                widget->set_use_opengl(toggled);
        }
+}
+
+void Interface::import_audio()
+{
+       if (currentSongWidget->get_song()->get_numtracks() > 0) {
+               QList<Track* > tracks = 
currentSongWidget->get_song()->get_tracks();
+               Track*  shortestTrack = tracks.at(0);
+
+               for (int i=1; i<tracks.size(); i++) {
+                       if (AudioClip* lastClip = 
tracks.at(i)->get_cliplist().get_last()) {
+                               shortestTrack = tracks.at(i);
+                       }
+               }
+               Import* cmd = new Import(shortestTrack);
+               Command::process_command(cmd);
+       }
+}
        
+void Interface::insert_silence()
+{
+       printf("FIXME: Interface::insert_silence()\n");
 }
 
 DigitalClock::DigitalClock(QWidget *parent)

Index: Interface.h
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/Interface.h,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- Interface.h 24 Apr 2007 23:57:10 -0000      1.31
+++ Interface.h 29 Apr 2007 05:54:17 -0000      1.32
@@ -141,6 +141,8 @@
        void set_fade_in_shape(QAction* action);
        void set_fade_out_shape(QAction* action);
        void update_opengl();
+       void import_audio();
+       void insert_silence();
 
        Command* show_song_widget();
        Command* full_screen();