Remove confusing track / group members in TimeSelection struct; time selection

[ardour.git] / gtk2_ardour / editor_timefx.cc

diff --git a/gtk2_ardour/editor_timefx.cc b/gtk2_ardour/editor_timefx.cc
index 4339962a87cbcb802c7526b997b96bc9fe197e1f..8538c7b8b3c79548a68e7188399357aefca6847e 100644 (file)
--- a/gtk2_ardour/editor_timefx.cc
+++ b/gtk2_ardour/editor_timefx.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2000 Paul Davis 
+    Copyright (C) 2000 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -27,7 +27,6 @@
 #include "pbd/pthread_utils.h"
 #include "pbd/memento_command.h"
 
-#include <gtkmm2ext/window_title.h>
 #include <gtkmm2ext/utils.h>
 
 #include "audio_region_view.h"
@@ -56,7 +55,6 @@ using namespace RubberBand;
 using namespace std;
 using namespace ARDOUR;
 using namespace PBD;
-using namespace sigc;
 using namespace Gtk;
 using namespace Gtkmm2ext;
 
@@ -64,7 +62,7 @@ int
 Editor::time_stretch (RegionSelection& regions, float fraction)
 {
        // FIXME: kludge, implement stretching of selection of both types
-       
+
        if (regions.front()->region()->data_type() == DataType::AUDIO) {
                // Audio, pop up timefx dialog
                return time_fx (regions, fraction, false);
@@ -73,7 +71,7 @@ Editor::time_stretch (RegionSelection& regions, float fraction)
                RouteTimeAxisView* rtv = dynamic_cast<RouteTimeAxisView*> (&regions.front()->get_time_axis_view());
                if (!rtv)
                        return -1;
-               
+
                boost::shared_ptr<Playlist> playlist
                        = rtv->track()->diskstream()->playlist();
 
@@ -135,12 +133,12 @@ Editor::time_fx (RegionSelection& regions, float val, bool pitching)
                // one octave == 1200 cents
                // adding one octave doubles the frequency
                // ratio is 2^^octaves
-                               
+
                pitch_fraction = pow(2, cents/1200);
 
                current_timefx->request.time_fraction = 1.0;
                current_timefx->request.pitch_fraction = pitch_fraction;
-               
+
        } else {
 
                current_timefx->request.time_fraction = val;
@@ -166,26 +164,26 @@ Editor::time_fx (RegionSelection& regions, float val, bool pitching)
                BandLimitedTransients,
                Transients
        } transients = Transients;
-       
+
        precise = current_timefx->precise_button.get_active();
        preserve_formants = current_timefx->preserve_formants_button.get_active();
-       
+
        txt = current_timefx->stretch_opts_selector.get_active_text ();
 
        if (txt == rb_opt_strings[0]) {
-               transients = NoTransients; peaklock = false; longwin = true; shortwin = false; 
+               transients = NoTransients; peaklock = false; longwin = true; shortwin = false;
        } else if (txt == rb_opt_strings[1]) {
-               transients = NoTransients; peaklock = false; longwin = false; shortwin = false; 
+               transients = NoTransients; peaklock = false; longwin = false; shortwin = false;
        } else if (txt == rb_opt_strings[2]) {
-               transients = NoTransients; peaklock = true; longwin = false; shortwin = false; 
+               transients = NoTransients; peaklock = true; longwin = false; shortwin = false;
        } else if (txt == rb_opt_strings[3]) {
-               transients = BandLimitedTransients; peaklock = true; longwin = false; shortwin = false; 
+               transients = BandLimitedTransients; peaklock = true; longwin = false; shortwin = false;
        } else if (txt == rb_opt_strings[5]) {
-               transients = Transients; peaklock = false; longwin = false; shortwin = true; 
+               transients = Transients; peaklock = false; longwin = false; shortwin = true;
        } else {
                /* default/4 */
 
-               transients = Transients; peaklock = true; longwin = false; shortwin = false; 
+               transients = Transients; peaklock = true; longwin = false; shortwin = false;
        }
 
        if (realtime)          options |= RubberBandStretcher::OptionProcessRealTime;
@@ -194,7 +192,7 @@ Editor::time_fx (RegionSelection& regions, float val, bool pitching)
        if (!peaklock)         options |= RubberBandStretcher::OptionPhaseIndependent;
        if (longwin)           options |= RubberBandStretcher::OptionWindowLong;
        if (shortwin)          options |= RubberBandStretcher::OptionWindowShort;
-               
+
        switch (transients) {
        case NoTransients:
                options |= RubberBandStretcher::OptionTransientsSmooth;
@@ -215,18 +213,18 @@ Editor::time_fx (RegionSelection& regions, float val, bool pitching)
        current_timefx->request.progress = 0.0f;
        current_timefx->request.done = false;
        current_timefx->request.cancel = false;
-       
+
        /* re-connect the cancel button and delete events */
-       
+
        current_timefx->first_cancel.disconnect();
        current_timefx->first_delete.disconnect();
-       
-       current_timefx->first_cancel = current_timefx->cancel_button->signal_clicked().connect 
-               (mem_fun (current_timefx, &TimeFXDialog::cancel_in_progress));
-       current_timefx->first_delete = current_timefx->signal_delete_event().connect 
-               (mem_fun (current_timefx, &TimeFXDialog::delete_in_progress));
 
-       if (pthread_create_and_store ("timefx", &current_timefx->request.thread, 0, timefx_thread, current_timefx)) {
+       current_timefx->first_cancel = current_timefx->cancel_button->signal_clicked().connect
+               (sigc::mem_fun (current_timefx, &TimeFXDialog::cancel_in_progress));
+       current_timefx->first_delete = current_timefx->signal_delete_event().connect
+               (sigc::mem_fun (current_timefx, &TimeFXDialog::delete_in_progress));
+
+       if (pthread_create_and_store ("timefx", &current_timefx->request.thread, timefx_thread, current_timefx)) {
                current_timefx->hide ();
                error << _("timefx cannot be started - thread creation error") << endmsg;
                return -1;
@@ -234,14 +232,14 @@ Editor::time_fx (RegionSelection& regions, float val, bool pitching)
 
        pthread_detach (current_timefx->request.thread);
 
-       sigc::connection c = Glib::signal_timeout().connect (mem_fun (current_timefx, &TimeFXDialog::update_progress), 100);
+       sigc::connection c = Glib::signal_timeout().connect (sigc::mem_fun (current_timefx, &TimeFXDialog::update_progress), 100);
 
        while (!current_timefx->request.done && !current_timefx->request.cancel) {
                gtk_main_iteration ();
        }
 
        c.disconnect ();
-       
+
        current_timefx->hide ();
        return current_timefx->status;
 }
@@ -253,7 +251,7 @@ Editor::do_timefx (TimeFXDialog& dialog)
        boost::shared_ptr<Playlist> playlist;
        boost::shared_ptr<Region>   new_region;
        bool in_command = false;
-       
+
        for (RegionSelection::iterator i = dialog.regions.begin(); i != dialog.regions.end(); ) {
                AudioRegionView* arv = dynamic_cast<AudioRegionView*>(*i);
 
@@ -265,7 +263,7 @@ Editor::do_timefx (TimeFXDialog& dialog)
                TimeAxisView* tv = &(arv->get_time_axis_view());
                RouteTimeAxisView* rtv;
                RegionSelection::iterator tmp;
-               
+
                tmp = i;
                ++tmp;
 
@@ -278,7 +276,7 @@ Editor::do_timefx (TimeFXDialog& dialog)
                        i = tmp;
                        continue;
                }
-       
+
                if ((playlist = t->diskstream()->playlist()) == 0) {
                        i = tmp;
                        continue;
@@ -338,7 +336,7 @@ Editor::do_timefx (TimeFXDialog& dialog)
 void*
 Editor::timefx_thread (void *arg)
 {
-       PBD::notify_gui_about_thread_creation (pthread_self(), X_("TimeFX"));
+       SessionEvent::create_per_thread_pool ("timefx events", 64);
 
        TimeFXDialog* tsd = static_cast<TimeFXDialog*>(arg);