Re-work main right-click context menu to operate on the selection, and remove some...

[ardour.git] / gtk2_ardour / editor_export_audio.cc

diff --git a/gtk2_ardour/editor_export_audio.cc b/gtk2_ardour/editor_export_audio.cc
index 8b4b3c140ce2bdac761cc0f2bfd3214770f2d6c5..d4f8cc3eb842a165f4239577577926d40b602735 100644 (file)
--- a/gtk2_ardour/editor_export_audio.cc
+++ b/gtk2_ardour/editor_export_audio.cc
@@ -15,7 +15,6 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id$
 */
 
 #include <unistd.h>
@@ -41,6 +40,7 @@
 #include <ardour/audio_diskstream.h>
 #include <ardour/audioregion.h>
 #include <ardour/audioplaylist.h>
+#include <ardour/chan_count.h>
 #include <ardour/source_factory.h>
 #include <ardour/audiofilesource.h>
 
@@ -87,19 +87,20 @@ Editor::export_range (nframes_t start, nframes_t end)
        }
 }      
 
+/** Export the first selected region */
 void
 Editor::export_region ()
 {
-       if (clicked_regionview == 0) {
+       if (selection->regions.empty()) {
                return;
        }
 
-       ExportDialog* dialog = new ExportRegionDialog (*this, clicked_regionview->region());
+       boost::shared_ptr<Region> r = selection->regions.front()->region();
+       
+       ExportDialog* dialog = new ExportRegionDialog (*this, r);
                
        dialog->connect_to_session (session);
-       dialog->set_range (
-               clicked_regionview->region()->first_frame(), 
-               clicked_regionview->region()->last_frame());
+       dialog->set_range (r->first_frame(), r->last_frame());
        dialog->start_export();
 }
 
@@ -128,6 +129,7 @@ int
 Editor::write_region_selection (RegionSelection& regions)
 {
        for (RegionSelection::iterator i = regions.begin(); i != regions.end(); ++i) {
+               // FIXME
                AudioRegionView* arv = dynamic_cast<AudioRegionView*>(*i);
                if (arv)
                        if (write_region ("", arv->audio_region()) == false)
@@ -208,7 +210,7 @@ Editor::write_region (string path, boost::shared_ptr<AudioRegion> region)
                
                        
                        try {
-                               fs = boost::dynamic_pointer_cast<AudioFileSource> (SourceFactory::createWritable (*session, path, false, session->frame_rate()));
+                               fs = boost::dynamic_pointer_cast<AudioFileSource> (SourceFactory::createWritable (DataType::AUDIO, *session, path, false, session->frame_rate()));
                        }
                        
                        catch (failed_constructor& err) {
@@ -302,7 +304,7 @@ Editor::write_audio_selection (TimeSelection& ts)
 }
 
 bool
-Editor::write_audio_range (AudioPlaylist& playlist, uint32_t channels, list<AudioRange>& range)
+Editor::write_audio_range (AudioPlaylist& playlist, const ChanCount& count, list<AudioRange>& range)
 {
        boost::shared_ptr<AudioFileSource> fs;
        const nframes_t chunk_size = 4096;
@@ -315,6 +317,8 @@ Editor::write_audio_range (AudioPlaylist& playlist, uint32_t channels, list<Audi
        string path;
        vector<boost::shared_ptr<AudioFileSource> > sources;
 
+       uint32_t channels = count.n_audio();
+
        for (uint32_t n=0; n < channels; ++n) {
                
                for (cnt = 0; cnt < 999999; ++cnt) {
@@ -340,7 +344,7 @@ Editor::write_audio_range (AudioPlaylist& playlist, uint32_t channels, list<Audi
                path = s;
                
                try {
-                       fs = boost::dynamic_pointer_cast<AudioFileSource> (SourceFactory::createWritable (*session, path, false, session->frame_rate()));
+                       fs = boost::dynamic_pointer_cast<AudioFileSource> (SourceFactory::createWritable (DataType::AUDIO, *session, path, false, session->frame_rate()));
                }
                
                catch (failed_constructor& err) {