X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Faudio_time_axis.cc;h=f8a460f778348fafa77c4743c81d62da37b24449;hb=192c6a9c1619de657602f385f92537e3c7ea5722;hp=9c31bfc9073248bd8659ca30522494f00c2e98fa;hpb=4b233612261e2d13ebbd1931f4d999c6da1451e9;p=ardour.git diff --git a/gtk2_ardour/audio_time_axis.cc b/gtk2_ardour/audio_time_axis.cc index 9c31bfc907..f8a460f778 100644 --- a/gtk2_ardour/audio_time_axis.cc +++ b/gtk2_ardour/audio_time_axis.cc @@ -78,7 +78,7 @@ #include "i18n.h" using namespace ARDOUR; -using namespace sigc; +//using namespace sigc; using namespace LADSPA; using namespace Gtk; using namespace Editing; @@ -109,9 +109,8 @@ AudioTimeAxisView::AudioTimeAxisView (PublicEditor& ed, Session& sess, Route& rt playlist_button (_("p")), size_button (_("h")), // height automation_button (_("a")), - visual_button (_("v")), - redirect_window ("redirect window"), - redirect_display (1) + visual_button (_("v")) + { _has_state = true; subplugin_menu.set_name ("ArdourContextMenu"); @@ -148,7 +147,7 @@ AudioTimeAxisView::AudioTimeAxisView (PublicEditor& ed, Session& sess, Route& rt visual_button.set_name ("TrackVisualButton"); hide_button.set_name ("TrackRemoveButton"); - hide_button.add (*(manage (new Pixmap (small_x_xpm)))); + hide_button.add (*(manage (new Image (Gdk::Pixbuf::create_from_xpm_data(small_x_xpm))))); _route.mute_changed.connect (mem_fun(*this, &RouteUI::mute_changed)); _route.solo_changed.connect (mem_fun(*this, &RouteUI::solo_changed)); @@ -168,8 +167,8 @@ AudioTimeAxisView::AudioTimeAxisView (PublicEditor& ed, Session& sess, Route& rt visual_button.signal_clicked().connect (mem_fun(*this, &AudioTimeAxisView::visual_click)); hide_button.signal_clicked().connect (mem_fun(*this, &AudioTimeAxisView::hide_click)); - name_entry.activate.connect (mem_fun(*this, &AudioTimeAxisView::name_entry_activated)); - name_entry.signal_focus_out_event()().connect (mem_fun(*this, &AudioTimeAxisView::name_entry_focus_out_handler)); + name_entry.signal_activate().connect (mem_fun(*this, &AudioTimeAxisView::name_entry_activated)); + name_entry.signal_focus_out_event().connect (mem_fun(*this, &AudioTimeAxisView::name_entry_focus_out_handler)); name_entry.signal_button_press_event().connect (mem_fun(*this, &AudioTimeAxisView::name_entry_button_press_handler)); name_entry.signal_button_release_event().connect (mem_fun(*this, &AudioTimeAxisView::name_entry_button_release_handler)); name_entry.signal_key_release_event().connect (mem_fun(*this, &AudioTimeAxisView::name_entry_key_release_handler)); @@ -222,7 +221,6 @@ AudioTimeAxisView::AudioTimeAxisView (PublicEditor& ed, Session& sess, Route& rt mute_changed(0); redirects_changed (0); reset_redirect_automation_curves (); - edit_group_menu_radio_group = 0; y_position = -1; ensure_xml_node (); @@ -350,7 +348,7 @@ AudioTimeAxisView::edit_click (GdkEventButton *ev) bind (mem_fun(*this, &AudioTimeAxisView::set_edit_group_from_menu), (RouteGroup *) 0))); if (_route.edit_group() == 0) { - static_cast(items.back())->set_active (); + static_cast(&items.back())->set_active (); } _session.foreach_edit_group (this, &AudioTimeAxisView::add_edit_group_menu_item); @@ -368,7 +366,7 @@ AudioTimeAxisView::add_edit_group_menu_item (RouteGroup *eg) items.push_back (RadioMenuElem (edit_group_menu_radio_group, eg->name(), bind (mem_fun(*this, &AudioTimeAxisView::set_edit_group_from_menu), eg))); if (_route.edit_group() == eg) { - static_cast(items.back())->set_active (); + static_cast(&items.back())->set_active (); } } @@ -739,12 +737,12 @@ AudioTimeAxisView::build_display_menu () automation_items.push_back (CheckMenuElem (_("gain"), mem_fun(*this, &AudioTimeAxisView::toggle_gain_track))); - gain_automation_item = static_cast (automation_items.back()); + gain_automation_item = static_cast (&automation_items.back()); gain_automation_item->set_active(show_gain_automation); automation_items.push_back (CheckMenuElem (_("pan"), mem_fun(*this, &AudioTimeAxisView::toggle_pan_track))); - pan_automation_item = static_cast (automation_items.back()); + pan_automation_item = static_cast (&automation_items.back()); pan_automation_item->set_active(show_pan_automation); automation_items.push_back (MenuElem (_("Plugins"), subplugin_menu)); @@ -756,7 +754,7 @@ AudioTimeAxisView::build_display_menu () waveform_menu->set_name ("ArdourContextMenu"); waveform_items.push_back (CheckMenuElem (_("Show waveforms"), mem_fun(*this, &AudioTimeAxisView::toggle_waveforms))); - waveform_item = static_cast (waveform_items.back()); + waveform_item = static_cast (&waveform_items.back()); ignore_toggle = true; waveform_item->set_active (editor.show_waveforms()); ignore_toggle = false; @@ -764,10 +762,10 @@ AudioTimeAxisView::build_display_menu () RadioMenuItem::Group group; waveform_items.push_back (RadioMenuElem (group, _("Traditional"), bind (mem_fun(*this, &AudioTimeAxisView::set_waveform_shape), Traditional))); - traditional_item = static_cast (waveform_items.back()); + traditional_item = static_cast (&waveform_items.back()); waveform_items.push_back (RadioMenuElem (group, _("Rectified"), bind (mem_fun(*this, &AudioTimeAxisView::set_waveform_shape), Rectified))); - rectified_item = static_cast (waveform_items.back()); + rectified_item = static_cast (&waveform_items.back()); items.push_back (MenuElem (_("Waveform"), *waveform_menu)); @@ -780,12 +778,12 @@ AudioTimeAxisView::build_display_menu () RadioMenuItem::Group align_group; alignment_items.push_back (RadioMenuElem (align_group, _("align with existing material"), bind (mem_fun(*this, &AudioTimeAxisView::set_align_style), ExistingMaterial))); - align_existing_item = dynamic_cast(alignment_items.back()); + align_existing_item = dynamic_cast(&alignment_items.back()); if (get_diskstream()->alignment_style() == ExistingMaterial) { align_existing_item->set_active(); } alignment_items.push_back (RadioMenuElem (align_group, _("align with capture time"), bind (mem_fun(*this, &AudioTimeAxisView::set_align_style), CaptureTime))); - align_capture_item = dynamic_cast(alignment_items.back()); + align_capture_item = dynamic_cast(&alignment_items.back()); if (get_diskstream()->alignment_style() == CaptureTime) { align_capture_item->set_active(); } @@ -797,7 +795,7 @@ AudioTimeAxisView::build_display_menu () items.push_back (SeparatorElem()); items.push_back (CheckMenuElem (_("Active"), mem_fun(*this, &RouteUI::toggle_route_active))); - route_active_menu_item = dynamic_cast (items.back()); + route_active_menu_item = dynamic_cast (&items.back()); route_active_menu_item->set_active (_route.active()); items.push_back (SeparatorElem()); @@ -832,6 +830,7 @@ void AudioTimeAxisView::rename_current_playlist () { ArdourPrompter prompter (true); + string name; AudioPlaylist *pl; DiskStream *ds; @@ -842,15 +841,15 @@ AudioTimeAxisView::rename_current_playlist () prompter.set_prompt (_("Name for playlist")); prompter.set_initial_text (pl->name()); - prompter.done.connect (Main::quit.slot()); - prompter.show_all (); - - Main::run (); - if (prompter.status == Gtkmm2ext::Prompter::entered) { - string name; + switch (prompter.run ()) { + case GTK_RESPONSE_ACCEPT: prompter.get_result (name); pl->set_name (name); + break; + + default: + break; } } @@ -869,29 +868,29 @@ AudioTimeAxisView::use_copy_playlist () { AudioPlaylist *pl; DiskStream *ds; + string name; if (((ds = get_diskstream()) == 0) || ((pl = ds->playlist()) == 0)) { return; } - + ArdourPrompter prompter (true); string new_name = Playlist::bump_name (pl->name(), _session); - + prompter.set_prompt (_("Name for playlist")); prompter.set_initial_text (new_name); - prompter.done.connect (Main::quit.slot()); prompter.show_all (); - Main::run (); - - if (prompter.status == Gtkmm2ext::Prompter::entered) { - string name; + switch (prompter.run ()) { + case GTK_RESPONSE_ACCEPT: prompter.get_result (name); - ds->use_copy_playlist (); - pl = ds->playlist(); pl->set_name (name); + break; + + default: + break; } } @@ -900,6 +899,7 @@ AudioTimeAxisView::use_new_playlist () { AudioPlaylist *pl; DiskStream *ds; + string name; if (((ds = get_diskstream()) == 0) || ((pl = ds->playlist()) == 0)) { return; @@ -910,19 +910,17 @@ AudioTimeAxisView::use_new_playlist () prompter.set_prompt (_("Name for playlist")); prompter.set_initial_text (new_name); - prompter.done.connect (Main::quit.slot()); - prompter.show_all (); - - Main::run (); - - if (prompter.status == Gtkmm2ext::Prompter::entered) { - string name; + + switch (prompter.run ()) { + case GTK_RESPONSE_ACCEPT: prompter.get_result (name); - ds->use_new_playlist (); - pl = ds->playlist(); pl->set_name (name); + break; + + default: + break; } } @@ -943,7 +941,7 @@ void AudioTimeAxisView::toggle_waveforms () { if (view && waveform_item && !ignore_toggle) { - view->set_show_waveforms (waveform_item->is_active()); + view->set_show_waveforms (waveform_item->get_active()); } } @@ -1447,7 +1445,7 @@ AudioTimeAxisView::add_redirect_automation_curve (Redirect *redirect, uint32_t w if ((ran = find_redirect_automation_node (redirect, what)) == 0) { fatal << _("programming error: ") - << compose (X_("redirect automation curve for %1:%2 not registered with audio track!"), + << string_compose (X_("redirect automation curve for %1:%2 not registered with audio track!"), redirect->name(), what) << endmsg; /*NOTREACHED*/ @@ -1574,7 +1572,7 @@ AudioTimeAxisView::add_redirect_to_subplugin_menu (Redirect* r) string name = r->describe_parameter (*i); items.push_back (CheckMenuElem (name)); - mitem = dynamic_cast (items.back()); + mitem = dynamic_cast (&items.back()); if (has_visible_automation.find((*i)) != has_visible_automation.end()) { mitem->set_active(true); @@ -1594,7 +1592,7 @@ AudioTimeAxisView::add_redirect_to_subplugin_menu (Redirect* r) } - mitem->toggled.connect (bind (mem_fun(*this, &AudioTimeAxisView::redirect_menu_item_toggled), rai, ran)); + mitem->signal_toggled().connect (bind (mem_fun(*this, &AudioTimeAxisView::redirect_menu_item_toggled), rai, ran)); } /* add the menu for this redirect, because the subplugin @@ -1886,7 +1884,7 @@ AudioTimeAxisView::build_playlist_menu (Gtk::Menu * menu) playlist_menu = new Menu; playlist_menu->set_name ("ArdourContextMenu"); - playlist_items.push_back (MenuElem (compose (_("Current: %1"), get_diskstream()->playlist()->name()))); + playlist_items.push_back (MenuElem (string_compose (_("Current: %1"), get_diskstream()->playlist()->name()))); playlist_items.push_back (SeparatorElem()); playlist_items.push_back (MenuElem (_("Rename"), mem_fun(*this, &AudioTimeAxisView::rename_current_playlist)));