projects / ardour.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
save keybindings to file used at startup; allow keybindings file to be cmdline-specif...
[ardour.git] / gtk2_ardour / crossfade_edit.cc
diff --git a/gtk2_ardour/crossfade_edit.cc b/gtk2_ardour/crossfade_edit.cc
index 451b9781f56547f7e8f9e9298a5746960337c5a8..4271a35315a84ac2315e0679496658a789109906 100644 (file)
--- a/gtk2_ardour/crossfade_edit.cc
+++ b/gtk2_ardour/crossfade_edit.cc
@@ -34,7 +34,9 @@
 #include <ardour/session.h>
 #include <ardour/auditioner.h>
 #include <ardour/audioplaylist.h>
+#include <ardour/audiosource.h>
 #include <ardour/playlist_templates.h>
+#include <ardour/region_factory.h>
 
 #include <gtkmm2ext/gtk_ui.h>
 
@@ -51,6 +53,7 @@
 
 using namespace std;
 using namespace ARDOUR;
+using namespace PBD;
 using namespace Gtk;
 using namespace sigc;
 using namespace Editing;
@@ -212,8 +215,6 @@ CrossfadeEditor::CrossfadeEditor (Session& s, Crossfade& xf, double my, double m
 
        for (list<Preset*>::iterator i = fade_out_presets->begin(); i != fade_out_presets->end(); ++i) {
 
-               cerr << "looking for xpm " << (*i)->xpm << endl;
-
                pxmap = manage (new Image (get_xpm((*i)->xpm)));
                pbutton = manage (new Button);
                pbutton->add (*pxmap);
@@ -590,7 +591,7 @@ CrossfadeEditor::canvas_allocation (Gtk::Allocation& alloc)
        vector<ArdourCanvas::WaveView*>::iterator i;
        uint32_t n;
 
-       ht = canvas->get_allocation().get_height() / xfade.in().n_channels();
+       ht = canvas->get_allocation().get_height() / xfade.in()->n_channels();
 
        for (n = 0, i = fade[In].waves.begin(); i != fade[In].waves.end(); ++i, ++n) {
                double yoff;
@@ -602,7 +603,7 @@ CrossfadeEditor::canvas_allocation (Gtk::Allocation& alloc)
                (*i)->property_samples_per_unit() = spu;
        }
 
-       ht = canvas->get_allocation().get_height() / xfade.out().n_channels();
+       ht = canvas->get_allocation().get_height() / xfade.out()->n_channels();
 
        for (n = 0, i = fade[Out].waves.begin(); i != fade[Out].waves.end(); ++i, ++n) {
                double yoff;
@@ -631,7 +632,7 @@ CrossfadeEditor::redraw ()
                return;
        }
 
-       jack_nframes_t len = xfade.length ();
+       nframes_t len = xfade.length ();
 
        fade[current].normative_curve.clear ();
        fade[current].gain_curve.clear ();
@@ -697,8 +698,6 @@ CrossfadeEditor::redraw ()
 
        }
 
-       // GTK2FIX some odd math to fix up here
-
        size_t last_spt = (npoints + 3) - 1;
 
        for (size_t i = 0; i < npoints; ++i) {
@@ -982,7 +981,7 @@ CrossfadeEditor::curve_select_clicked (WhichFade wf)
                }
                
                for (list<Point*>::iterator i = fade[Out].points.begin(); i != fade[Out].points.end(); ++i) {
-                       (*i)->box->hide();
+                       (*i)->box->show();
                }
 
                for (vector<Button*>::iterator i = fade_out_buttons.begin(); i != fade_out_buttons.end(); ++i) {
@@ -1015,10 +1014,10 @@ CrossfadeEditor::y_coordinate (double& yfract) const
 }
 
 void
-CrossfadeEditor::make_waves (AudioRegion& region, WhichFade which)
+CrossfadeEditor::make_waves (boost::shared_ptr<AudioRegion> region, WhichFade which)
 {
        gdouble ht;
-       uint32_t nchans = region.n_channels();
+       uint32_t nchans = region->n_channels();
        guint32 color;
        double spu;
 
@@ -1035,11 +1034,11 @@ CrossfadeEditor::make_waves (AudioRegion& region, WhichFade which)
                
                gdouble yoff = n * ht;
                
-               if (region.source(n).peaks_ready (bind (mem_fun(*this, &CrossfadeEditor::peaks_ready), &region, which), peaks_ready_connection)) {
+               if (region->source(n)->peaks_ready (bind (mem_fun(*this, &CrossfadeEditor::peaks_ready), region, which), peaks_ready_connection)) {
                        
                        WaveView* waveview = new WaveView (*(canvas->root()));
 
-                       waveview->property_data_src() = &region;
+                       waveview->property_data_src() = region.get();
                        waveview->property_cache_updater() =  true;
                        waveview->property_cache() = WaveView::create_cache();
                        waveview->property_channel() = n;
@@ -1064,26 +1063,26 @@ CrossfadeEditor::make_waves (AudioRegion& region, WhichFade which)
 }
 
 void
-CrossfadeEditor::peaks_ready (AudioRegion* r, WhichFade which)
+CrossfadeEditor::peaks_ready (boost::shared_ptr<AudioRegion> r, WhichFade which)
 {
        /* this should never be called, because the peak files for an xfade
           will be ready by the time we want them. but our API forces us
           to provide this, so ..
        */
        peaks_ready_connection.disconnect ();
-       make_waves (*r, which);
+       make_waves (r, which);
 }
 
 void
 CrossfadeEditor::audition_both ()
 {
-       AudioPlaylist& pl (session.the_auditioner().prepare_playlist());
-       jack_nframes_t preroll;
-       jack_nframes_t postroll;
-       jack_nframes_t length;
-       jack_nframes_t left_start_offset;
-       jack_nframes_t right_length;
-       jack_nframes_t left_length;
+       AudioPlaylist& pl (session.the_auditioner()->prepare_playlist());
+       nframes_t preroll;
+       nframes_t postroll;
+       nframes_t length;
+       nframes_t left_start_offset;
+       nframes_t right_length;
+       nframes_t left_length;
 
        if (preroll_button.get_active()) {
                preroll = ARDOUR_UI::instance()->preroll_clock.current_duration ();
@@ -1097,29 +1096,29 @@ CrossfadeEditor::audition_both ()
                postroll = 0;
        }
 
-       if ((left_start_offset = xfade.out().length() - xfade.length()) >= preroll) {
+       if ((left_start_offset = xfade.out()->length() - xfade.length()) >= preroll) {
                left_start_offset -= preroll;
        } 
 
        length = 0;
 
-       if ((left_length = xfade.length()) < xfade.out().length() - left_start_offset) {
+       if ((left_length = xfade.length()) < xfade.out()->length() - left_start_offset) {
                length += postroll;
        }
 
        right_length = xfade.length();
 
-       if (xfade.in().length() - right_length < postroll) {
+       if (xfade.in()->length() - right_length < postroll) {
                right_length += postroll;
        }
 
-       AudioRegion* left = new AudioRegion (xfade.out(), left_start_offset, left_length, "xfade out", 
-                                            0, Region::DefaultFlags, false);
-       AudioRegion* right = new AudioRegion (xfade.in(), 0, right_length, "xfade in", 
-                                             0, Region::DefaultFlags, false);
+       boost::shared_ptr<AudioRegion> left (boost::dynamic_pointer_cast<AudioRegion> (RegionFactory::create (xfade.out(), left_start_offset, left_length, "xfade out", 
+                                                                                                             0, Region::DefaultFlags, false)));
+       boost::shared_ptr<AudioRegion> right (boost::dynamic_pointer_cast<AudioRegion> (RegionFactory::create (xfade.in(), 0, right_length, "xfade in", 
+                                                                                                              0, Region::DefaultFlags, false)));
        
-       pl.add_region (*left, 0);
-       pl.add_region (*right, 1+preroll);
+       pl.add_region (left, 0);
+       pl.add_region (right, 1+preroll);
 
        /* there is only one ... */
 
@@ -1131,24 +1130,24 @@ CrossfadeEditor::audition_both ()
 void
 CrossfadeEditor::audition_left_dry ()
 {
-       AudioRegion* left = new AudioRegion (xfade.out(), xfade.out().length() - xfade.length(), xfade.length(), "xfade left", 
-                                            0, Region::DefaultFlags, false);
+       boost::shared_ptr<AudioRegion> left (boost::dynamic_pointer_cast<AudioRegion> (RegionFactory::create (xfade.out(), xfade.out()->length() - xfade.length(), xfade.length(), "xfade left", 
+                                                                                                             0, Region::DefaultFlags, false)));
        
-       session.audition_region (*left);
+       session.audition_region (left);
 }
 
 void
 CrossfadeEditor::audition_left ()
 {
-       AudioPlaylist& pl (session.the_auditioner().prepare_playlist());
+       AudioPlaylist& pl (session.the_auditioner()->prepare_playlist());
 
-       AudioRegion* left = new AudioRegion (xfade.out(), xfade.out().length() - xfade.length(), xfade.length(), "xfade left", 
-                                            0, Region::DefaultFlags, false);
-       AudioRegion* right = new AudioRegion (xfade.in(), 0, xfade.length(), "xfade in", 
-                                             0, Region::DefaultFlags, false);
+       boost::shared_ptr<AudioRegion> left (boost::dynamic_pointer_cast<AudioRegion> (RegionFactory::create (xfade.out(), xfade.out()->length() - xfade.length(), xfade.length(), "xfade left", 
+                                                                                                             0, Region::DefaultFlags, false)));
+       boost::shared_ptr<AudioRegion> right (boost::dynamic_pointer_cast<AudioRegion> (RegionFactory::create (xfade.in(), 0, xfade.length(), "xfade in", 
+                                                                                                              0, Region::DefaultFlags, false)));
 
-       pl.add_region (*left, 0);
-       pl.add_region (*right, 1);
+       pl.add_region (left, 0);
+       pl.add_region (right, 1);
 
        right->set_muted (true);
 
@@ -1164,23 +1163,23 @@ CrossfadeEditor::audition_left ()
 void
 CrossfadeEditor::audition_right_dry ()
 {
-       AudioRegion* right = new AudioRegion (xfade.in(), 0, xfade.length(), "xfade in", 
-                                             0, Region::DefaultFlags, false);
-       session.audition_region (*right);
+       boost::shared_ptr<AudioRegion> right (boost::dynamic_pointer_cast<AudioRegion> (RegionFactory::create (xfade.in(), 0, xfade.length(), "xfade in", 
+                                                                                                              0, Region::DefaultFlags, false)));
+       session.audition_region (right);
 }
 
 void
 CrossfadeEditor::audition_right ()
 {
-       AudioPlaylist& pl (session.the_auditioner().prepare_playlist());
+       AudioPlaylist& pl (session.the_auditioner()->prepare_playlist());
 
-       AudioRegion* left = new AudioRegion (xfade.out(), xfade.out().length() - xfade.length(), xfade.length(), "xfade out", 
-                                            0, Region::DefaultFlags, false);
-       AudioRegion* right = new AudioRegion (xfade.out(), 0, xfade.length(), "xfade out", 
-                                             0, Region::DefaultFlags, false);
+       boost::shared_ptr<AudioRegion> left (boost::dynamic_pointer_cast<AudioRegion> (RegionFactory::create (xfade.out(), xfade.out()->length() - xfade.length(), xfade.length(), "xfade out", 
+                                                                                                             0, Region::DefaultFlags, false)));
+                                            boost::shared_ptr<AudioRegion> right (boost::dynamic_pointer_cast<AudioRegion> (RegionFactory::create (xfade.out(), 0, xfade.length(), "xfade out", 
+                                                                                                              0, Region::DefaultFlags, false)));
 
-       pl.add_region (*left, 0);
-       pl.add_region (*right, 1);
+       pl.add_region (left, 0);
+       pl.add_region (right, 1);
        
        left->set_muted (true);
 
Unnamed repository; edit this file 'description' to name the repository.