X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor.cc;h=a44eba37544994c64241a983f5ecd0092d82decf;hb=a20f41ab39cc034740ccd564c1057d8737d763d5;hp=c34a807402f77c99823f359b17e36f2d27a9b2f2;hpb=14d43ca9fe28a8309b4a52fa85e2b0c64a92248b;p=ardour.git diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc index c34a807402..a44eba3754 100644 --- a/gtk2_ardour/editor.cc +++ b/gtk2_ardour/editor.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2000 Paul Davis + Copyright (C) 2000-2006 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 @@ -26,9 +26,12 @@ #include -#include #include +#include +#include +#include + #include #include #include @@ -39,21 +42,15 @@ #include #include #include -#include +#include #include #include #include #include "ardour_ui.h" -#include "canvas-ruler.h" -#include "canvas-simpleline.h" -#include "canvas-simplerect.h" -#include "canvas-waveview.h" -#include "check_mark.h" #include "editor.h" #include "grouped_buttons.h" #include "keyboard.h" -#include "library_ui.h" #include "marker.h" #include "playlist_selector.h" #include "regionview.h" @@ -66,8 +63,9 @@ #include "editing.h" #include "public_editor.h" #include "crossfade_edit.h" -#include "extra_bind.h" #include "audio_time_axis.h" +#include "canvas_impl.h" +#include "actions.h" #include "gui_thread.h" #include "i18n.h" @@ -80,35 +78,14 @@ using namespace std; using namespace sigc; using namespace ARDOUR; using namespace Gtk; +using namespace Glib; using namespace Gtkmm2ext; using namespace Editing; -/* XXX this is a hack. it ought to be the maximum value of an jack_nframes_t */ - -const double max_canvas_coordinate = 100000000.0; const double Editor::timebar_height = 15.0; #include "editor_xpms" -static const gchar *route_list_titles[] = { - N_("Tracks"), - 0 -}; - -static const gchar *edit_group_list_titles[] = { - "foo", "bar", 0 -}; - -static const gchar *region_list_display_titles[] = { - N_("Regions/name"), - 0 -}; - -static const gchar *named_selection_display_titles[] = { - N_("Chunks"), - 0 -}; - static const int32_t slide_index = 0; static const int32_t splice_index = 1; @@ -159,39 +136,77 @@ static const gchar *zoom_focus_strings[] = { /* Soundfile drag-n-drop */ -enum { - TARGET_STRING, - TARGET_ROOTWIN, - TARGET_URL -}; +Gdk::Cursor* Editor::cross_hair_cursor = 0; +Gdk::Cursor* Editor::selector_cursor = 0; +Gdk::Cursor* Editor::trimmer_cursor = 0; +Gdk::Cursor* Editor::grabber_cursor = 0; +Gdk::Cursor* Editor::zoom_cursor = 0; +Gdk::Cursor* Editor::time_fx_cursor = 0; +Gdk::Cursor* Editor::fader_cursor = 0; +Gdk::Cursor* Editor::speaker_cursor = 0; +Gdk::Cursor* Editor::wait_cursor = 0; +Gdk::Cursor* Editor::timebar_cursor = 0; -static GtkTargetEntry target_table[] = { - { "STRING", 0, TARGET_STRING }, - { "text/plain", 0, TARGET_STRING }, - { "text/uri-list", 0, TARGET_URL }, - { "application/x-rootwin-drop", 0, TARGET_ROOTWIN } -}; +bool +Editor::on_key_press_event (GdkEventKey* ev) +{ + GtkWindow* win = gobj(); + + /* This exists to allow us to override the way GTK handles + key events. The normal sequence is: + + a) event is delivered to a GtkWindow + b) accelerators/mnemonics are activated + c) if (b) didn't handle the event, propagate to + the focus widget and/or focus chain + + The problem with this is that if the accelerators include + keys without modifiers, such as the space bar or the + letter "e", then pressing the key while typing into + a text entry widget results in the accelerator being + activated, instead of the desired letter appearing + in the text entry. + + There is no good way of fixing this, but this + represents a compromise. The idea is that + key events involving modifiers (not Shift) + get routed into the activation pathway first, then + get propagated to the focus widget if necessary. + + If the key event doesn't involve modifiers, + we deliver to the focus widget first, thus allowing + it to get "normal text" without interference + from acceleration. + + Of course, this can also be problematic: if there + is a widget with focus, then it will swallow + all "normal text" accelerators. + */ + + if (ev->state & ~Gdk::SHIFT_MASK) { + /* modifiers in effect, accelerate first */ + if (!gtk_window_activate_key (win, ev)) { + return gtk_window_propagate_key_event (win, ev); + } else { + return true; + } + } + + /* no modifiers, propagate first */ -static guint n_targets = sizeof(target_table) / sizeof(target_table[0]); + if (!gtk_window_propagate_key_event (win, ev)) { + return gtk_window_activate_key (win, ev); + } -GdkCursor* Editor::cross_hair_cursor = 0; -GdkCursor* Editor::selector_cursor = 0; -GdkCursor* Editor::trimmer_cursor = 0; -GdkCursor* Editor::grabber_cursor = 0; -GdkCursor* Editor::zoom_cursor = 0; -GdkCursor* Editor::time_fx_cursor = 0; -GdkCursor* Editor::fader_cursor = 0; -GdkCursor* Editor::speaker_cursor = 0; -GdkCursor* Editor::null_cursor = 0; -GdkCursor* Editor::wait_cursor = 0; -GdkCursor* Editor::timebar_cursor = 0; -GdkPixmap *Editor::check_pixmap = 0; -GdkBitmap *Editor::check_mask = 0; -GdkPixmap *Editor::empty_pixmap = 0; -GdkBitmap *Editor::empty_mask = 0; + return true; +} -extern gint route_list_compare_func (GtkCList*,gconstpointer,gconstpointer); +void +show_me_the_size (Requisition* r, const char* what) +{ + cerr << "size of " << what << " = " << r->width << " x " << r->height << endl; +} Editor::Editor (AudioEngine& eng) : engine (eng), @@ -209,13 +224,14 @@ Editor::Editor (AudioEngine& eng) transport_mark_label (_("Loop/Punch Ranges")), edit_packer (3, 3, false), - edit_hscroll_left_arrow (Gtk::ARROW_LEFT, Gtk::SHADOW_OUT), - edit_hscroll_right_arrow (Gtk::ARROW_RIGHT, Gtk::SHADOW_OUT), - region_list_display (internationalize (region_list_display_titles)), + /* the values here don't matter: layout widgets + reset them as needed. + */ + + vertical_adjustment (0.0, 0.0, 400.0, 10), + horizontal_adjustment (0.0, 0.0, 1200.0, 20), - named_selection_display (internationalize (named_selection_display_titles)), - /* tool bar related */ editor_mixer_button (_("editor\nmixer")), @@ -244,9 +260,6 @@ Editor::Editor (AudioEngine& eng) snap_mode_label(_("Snap Mode")), zoom_focus_label (_("Zoom Focus")), - route_list (internationalize (route_list_titles)), - edit_group_list (internationalize (edit_group_list_titles)), - /* */ image_socket_listener(0), /* */ @@ -265,13 +278,6 @@ Editor::Editor (AudioEngine& eng) init_colormap (); - check_pixmap = gdk_pixmap_colormap_create_from_xpm_d (NULL, - gtk_widget_get_colormap (GTK_WIDGET(edit_group_list.gobj())), - &check_mask, NULL, (gchar **) check_xpm); - empty_pixmap = gdk_pixmap_colormap_create_from_xpm_d (NULL, - gtk_widget_get_colormap (GTK_WIDGET(edit_group_list.gobj())), - &empty_mask, NULL, (gchar **) empty_xpm); - session = 0; selection = new Selection; @@ -288,11 +294,9 @@ Editor::Editor (AudioEngine& eng) clicked_crossfadeview = 0; clicked_control_point = 0; latest_regionview = 0; - region_list_display_drag_region = 0; last_update_frame = 0; drag_info.item = 0; last_audition_region = 0; - region_list_button_region = 0; current_mixer_strip = 0; current_bbt_points = 0; @@ -314,8 +318,8 @@ Editor::Editor (AudioEngine& eng) export_dialog = 0; show_gain_after_trim = false; no_zoom_repos_update = false; - need_wave_cursor = 0; ignore_route_list_reorder = false; + no_route_list_redisplay = false; verbose_cursor_on = true; route_removal = false; track_spacing = 0; @@ -325,6 +329,7 @@ Editor::Editor (AudioEngine& eng) _xfade_visibility = true; editor_ruler_menu = 0; no_ruler_shown_update = false; + edit_hscroll_dragging = false; edit_group_list_menu = 0; route_list_menu = 0; region_list_menu = 0; @@ -335,12 +340,9 @@ Editor::Editor (AudioEngine& eng) new_transport_marker_menu = 0; editor_mixer_strip_width = Wide; repos_zoom_queued = false; - import_audio_item = 0; - embed_audio_item = 0; region_edit_menu_split_item = 0; temp_location = 0; region_edit_menu_split_multichannel_item = 0; - edit_hscroll_dragging = false; leftmost_frame = 0; ignore_mouse_mode_toggle = false; current_stepping_trackview = 0; @@ -362,7 +364,6 @@ Editor::Editor (AudioEngine& eng) range_marker_drag_rect = 0; marker_drag_line = 0; - mouse_mode = MouseZoom; /* force change in next call */ set_mouse_mode (MouseObject, true); frames_per_unit = 2048; /* too early to use set_frames_per_unit */ @@ -372,56 +373,42 @@ Editor::Editor (AudioEngine& eng) initialize_rulers (); initialize_canvas (); - track_canvas_scroller.add (*track_canvas); - track_canvas_scroller.set_policy (Gtk::POLICY_NEVER, Gtk::POLICY_NEVER); - track_canvas_scroller.set_name ("TrackCanvasScroller"); - - track_canvas_scroller.get_vadjustment()->value_changed.connect (mem_fun(*this, &Editor::tie_vertical_scrolling)); - track_canvas_scroller.get_vadjustment()->set_step_increment (10.0); - - track_canvas_scroller.get_hadjustment()->set_lower (0.0); - track_canvas_scroller.get_hadjustment()->set_upper (1200.0); - track_canvas_scroller.get_hadjustment()->set_step_increment (20.0); - track_canvas_scroller.get_hadjustment()->value_changed.connect (mem_fun(*this, &Editor::canvas_horizontally_scrolled)); + edit_controls_vbox.set_spacing (0); + horizontal_adjustment.signal_value_changed().connect (mem_fun(*this, &Editor::canvas_horizontally_scrolled)); + vertical_adjustment.signal_value_changed().connect (mem_fun(*this, &Editor::tie_vertical_scrolling)); - edit_vscrollbar.set_adjustment(track_canvas_scroller.get_vadjustment()); - edit_hscrollbar.set_adjustment(track_canvas_scroller.get_hadjustment()); + track_canvas.set_hadjustment (horizontal_adjustment); + track_canvas.set_vadjustment (vertical_adjustment); + time_canvas.set_hadjustment (horizontal_adjustment); - edit_hscrollbar.button_press_event.connect (mem_fun(*this, &Editor::hscroll_slider_button_press)); - edit_hscrollbar.button_release_event.connect (mem_fun(*this, &Editor::hscroll_slider_button_release)); - edit_hscrollbar.size_allocate.connect (mem_fun(*this, &Editor::hscroll_slider_allocate)); + track_canvas.signal_map_event().connect (mem_fun (*this, &Editor::track_canvas_map_handler)); + time_canvas.signal_map_event().connect (mem_fun (*this, &Editor::time_canvas_map_handler)); - time_canvas_scroller.add (*time_canvas); - time_canvas_scroller.set_policy (Gtk::POLICY_NEVER, Gtk::POLICY_NEVER); - time_canvas_scroller.set_hadjustment (track_canvas_scroller.get_hadjustment()); - time_canvas_scroller.set_name ("TimeCanvasScroller"); - - edit_controls_vbox.set_spacing (track_spacing); - edit_controls_hbox.pack_start (edit_controls_vbox, true, true); - edit_controls_scroller.add_with_viewport (edit_controls_hbox); - edit_controls_scroller.set_name ("EditControlsBase"); - edit_controls_scroller.set_policy (Gtk::POLICY_NEVER, Gtk::POLICY_NEVER); + controls_layout.add (edit_controls_vbox); + controls_layout.set_name ("EditControlsBase"); + controls_layout.add_events (Gdk::SCROLL_MASK); + controls_layout.signal_scroll_event().connect (mem_fun(*this, &Editor::control_layout_scroll), false); + + controls_layout.add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK|Gdk::ENTER_NOTIFY_MASK|Gdk::LEAVE_NOTIFY_MASK); + controls_layout.signal_button_release_event().connect (mem_fun(*this, &Editor::edit_controls_button_release)); - Viewport* viewport = static_cast (edit_controls_scroller.get_child()); + edit_vscrollbar.set_adjustment (vertical_adjustment); + edit_hscrollbar.set_adjustment (horizontal_adjustment); - viewport->set_shadow_type (GTK_SHADOW_NONE); - viewport->set_name ("EditControlsBase"); - viewport->add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK|GDK_ENTER_NOTIFY_MASK|GDK_LEAVE_NOTIFY_MASK); - viewport->button_release_event.connect (mem_fun(*this, &Editor::edit_controls_button_release)); + edit_hscrollbar.signal_button_press_event().connect (mem_fun(*this, &Editor::hscrollbar_button_press)); + edit_hscrollbar.signal_button_release_event().connect (mem_fun(*this, &Editor::hscrollbar_button_release)); + edit_hscrollbar.signal_size_allocate().connect (mem_fun(*this, &Editor::hscrollbar_allocate)); build_cursors (); setup_toolbar (); - XMLNode* node = ARDOUR_UI::instance()->editor_settings(); - set_state (*node); - edit_cursor_clock.ValueChanged.connect (mem_fun(*this, &Editor::edit_cursor_clock_changed)); time_canvas_vbox.pack_start (*minsec_ruler, false, false); time_canvas_vbox.pack_start (*smpte_ruler, false, false); time_canvas_vbox.pack_start (*frames_ruler, false, false); time_canvas_vbox.pack_start (*bbt_ruler, false, false); - time_canvas_vbox.pack_start (time_canvas_scroller, true, true); + time_canvas_vbox.pack_start (time_canvas, true, true); time_canvas_vbox.set_size_request (-1, (int)(timebar_height * visible_timebars)); bbt_label.set_name ("EditorTimeButton"); @@ -473,37 +460,33 @@ Editor::Editor (AudioEngine& eng) time_button_event_box.set_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK); time_button_event_box.set_name ("TimebarLabelBase"); - time_button_event_box.button_release_event.connect (mem_fun(*this, &Editor::ruler_label_button_release)); + time_button_event_box.signal_button_release_event().connect (mem_fun(*this, &Editor::ruler_label_button_release)); /* these enable us to have a dedicated window (for cursor setting, etc.) for the canvas areas. */ - track_canvas_event_box.add (track_canvas_scroller); + track_canvas_event_box.add (track_canvas); time_canvas_event_box.add (time_canvas_vbox); time_canvas_event_box.set_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK|Gdk::POINTER_MOTION_MASK); - edit_packer.set_col_spacings (0); edit_packer.set_row_spacings (0); edit_packer.set_homogeneous (false); edit_packer.set_name ("EditorWindow"); -// edit_packer.attach (edit_hscroll_left_arrow_event, 0, 1, 0, 1, Gtk::FILL, 0, 0, 0); -// edit_packer.attach (edit_hscroll_slider, 1, 2, 0, 1, Gtk::FILL|Gtk::EXPAND, 0, 0, 0); -// edit_packer.attach (edit_hscroll_right_arrow_event, 2, 3, 0, 1, Gtk::FILL, 0, 0, 0); - edit_packer.attach (edit_hscrollbar, 1, 2, 0, 1, Gtk::FILL|Gtk::EXPAND, 0, 0, 0); + edit_packer.attach (edit_hscrollbar, 1, 2, 0, 1, FILL|EXPAND, FILL, 0, 0); - edit_packer.attach (time_button_event_box, 0, 1, 1, 2, Gtk::FILL, 0, 0, 0); - edit_packer.attach (time_canvas_event_box, 1, 2, 1, 2, Gtk::FILL|Gtk::EXPAND, 0, 0, 0); + edit_packer.attach (time_button_event_box, 0, 1, 1, 2, FILL, FILL, 0, 0); + edit_packer.attach (time_canvas_event_box, 1, 2, 1, 2, FILL|EXPAND, FILL, 0, 0); - edit_packer.attach (edit_controls_scroller, 0, 1, 2, 3, Gtk::FILL, Gtk::FILL|Gtk::EXPAND, 0, 0); - edit_packer.attach (track_canvas_event_box, 1, 2, 2, 3, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 0, 0); - edit_packer.attach (edit_vscrollbar, 2, 3, 2, 3, 0, Gtk::FILL|Gtk::EXPAND, 0, 0); + edit_packer.attach (controls_layout, 0, 1, 2, 3, FILL, FILL|EXPAND, 0, 0); + edit_packer.attach (track_canvas_event_box, 1, 2, 2, 3, FILL|EXPAND, FILL|EXPAND, 0, 0); + edit_packer.attach (edit_vscrollbar, 2, 3, 2, 3, FILL, FILL|EXPAND, 0, 0); edit_frame.set_name ("BaseFrame"); - edit_frame.set_shadow_type (Gtk::SHADOW_IN); + edit_frame.set_shadow_type (SHADOW_IN); edit_frame.add (edit_packer); zoom_in_button.set_name ("EditorTimeButton"); @@ -511,190 +494,188 @@ Editor::Editor (AudioEngine& eng) ARDOUR_UI::instance()->tooltips().set_tip (zoom_in_button, _("Zoom in")); ARDOUR_UI::instance()->tooltips().set_tip (zoom_out_button, _("Zoom out")); -// zoom_onetoone_button.set_name ("EditorTimeButton"); zoom_out_full_button.set_name ("EditorTimeButton"); -// ARDOUR_UI::instance()->tooltips().set_tip (zoom_onetoone_button, _("Zoom in 1:1")); ARDOUR_UI::instance()->tooltips().set_tip (zoom_out_full_button, _("Zoom to session")); - zoom_in_button.add (*(manage (new Gtk::Image (zoom_in_button_xpm)))); - zoom_out_button.add (*(manage (new Gtk::Image (zoom_out_button_xpm)))); - zoom_out_full_button.add (*(manage (new Gtk::Image (zoom_out_full_button_xpm)))); -// zoom_onetoone_button.add (*(manage (new Gtk::Image (zoom_onetoone_button_xpm)))); - + zoom_in_button.add (*(manage (new Image (Stock::ZOOM_IN, ICON_SIZE_BUTTON)))); + zoom_out_button.add (*(manage (new Image (Stock::ZOOM_OUT, ICON_SIZE_BUTTON)))); + zoom_out_full_button.add (*(manage (new Image (Stock::ZOOM_FIT, ICON_SIZE_BUTTON)))); zoom_in_button.signal_clicked().connect (bind (mem_fun(*this, &Editor::temporal_zoom_step), false)); zoom_out_button.signal_clicked().connect (bind (mem_fun(*this, &Editor::temporal_zoom_step), true)); zoom_out_full_button.signal_clicked().connect (mem_fun(*this, &Editor::temporal_zoom_session)); -// zoom_onetoone_button.signal_clicked().connect (bind (mem_fun(*this, &Editor::temporal_zoom), 1.0)); zoom_indicator_box.pack_start (zoom_out_button, false, false); zoom_indicator_box.pack_start (zoom_in_button, false, false); zoom_indicator_box.pack_start (zoom_range_clock, false, false); -// zoom_indicator_box.pack_start (zoom_onetoone_button, false, false); zoom_indicator_box.pack_start (zoom_out_full_button, false, false); zoom_indicator_label.set_text (_("Zoom Span")); zoom_indicator_label.set_name ("ToolBarLabel"); - zoom_indicator_vbox.set_spacing (3); zoom_indicator_vbox.set_border_width (3); zoom_indicator_vbox.pack_start (zoom_indicator_label, false, false); zoom_indicator_vbox.pack_start (zoom_indicator_box, false, false); - bottom_hbox.set_border_width (3); bottom_hbox.set_spacing (3); - route_list.set_name ("TrackListDisplay"); - route_list.set_size_request (75,-1); - route_list.column_titles_active(); - route_list.set_compare_func (route_list_compare_func); - route_list.set_shadow_type (Gtk::SHADOW_IN); - route_list.set_selection_mode (GTK_SELECTION_MULTIPLE); - route_list.set_reorderable (true); - edit_group_list.set_size_request (75, -1); + route_display_model = ListStore::create(route_display_columns); + route_list_display.set_model (route_display_model); + route_list_display.append_column (_("Tracks"), route_display_columns.text); + route_list_display.set_headers_visible (false); + route_list_display.set_name ("TrackListDisplay"); + route_list_display.get_selection()->set_mode (SELECTION_MULTIPLE); + route_list_display.set_reorderable (true); + route_list_display.set_size_request (75,-1); - route_list_scroller.add (route_list); - route_list_scroller.set_policy (Gtk::POLICY_NEVER, Gtk::POLICY_AUTOMATIC); + route_display_model->signal_rows_reordered().connect (mem_fun (*this, &Editor::route_list_reordered)); + route_display_model->set_sort_func (0, mem_fun (*this, &Editor::route_list_compare_func)); + route_display_model->set_sort_column (0, SORT_ASCENDING); - route_list.select_row.connect (mem_fun(*this, &Editor::route_list_selected)); - route_list.unselect_row.connect (mem_fun(*this, &Editor::route_list_unselected)); - route_list.row_move.connect (mem_fun(*this, &Editor::queue_route_list_reordered)); - route_list.click_column.connect (mem_fun(*this, &Editor::route_list_column_click)); + route_list_scroller.add (route_list_display); + route_list_scroller.set_policy (POLICY_NEVER, POLICY_AUTOMATIC); + + route_list_display.get_selection()->signal_changed().connect (mem_fun (*this, &Editor::route_display_selection_changed)); edit_group_list_button_label.set_text (_("Edit Groups")); edit_group_list_button_label.set_name ("EditGroupTitleButton"); edit_group_list_button.add (edit_group_list_button_label); edit_group_list_button.set_name ("EditGroupTitleButton"); - edit_group_list.column_titles_hide(); - edit_group_list.set_name ("MixerGroupList"); - edit_group_list.set_shadow_type (Gtk::SHADOW_IN); - edit_group_list.set_selection_mode (GTK_SELECTION_MULTIPLE); - edit_group_list.set_reorderable (false); - edit_group_list.set_size_request (75, -1); - edit_group_list.set_column_auto_resize (0, true); - edit_group_list.columns_autosize (); + group_model = ListStore::create(group_columns); + edit_group_display.set_model (group_model); + edit_group_display.append_column (_("active"), group_columns.is_active); + edit_group_display.append_column (_("groupname"), group_columns.text); + edit_group_display.get_column (0)->set_data (X_("colnum"), GUINT_TO_POINTER(0)); + edit_group_display.get_column (0)->set_data (X_("colnum"), GUINT_TO_POINTER(1)); + edit_group_display.set_headers_visible (false); - edit_group_list_scroller.add (edit_group_list); - edit_group_list_scroller.set_policy (Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC); + /* use checkbox for the active column */ - edit_group_list_button.signal_clicked().connect (mem_fun(*this, &Editor::edit_group_list_button_clicked)); - edit_group_list.button_press_event.connect (mem_fun(*this, &Editor::edit_group_list_button_press_event)); - edit_group_list.select_row.connect (mem_fun(*this, &Editor::edit_group_selected)); - edit_group_list.unselect_row.connect (mem_fun(*this, &Editor::edit_group_unselected)); + CellRendererToggle *active_cell = dynamic_cast(edit_group_display.get_column_cell_renderer (0)); + active_cell->property_activatable() = true; + active_cell->property_radio() = false; + + edit_group_display.set_name ("MixerGroupList"); + edit_group_display.columns_autosize (); + edit_group_display.get_selection()->set_mode (SELECTION_MULTIPLE); + edit_group_display.set_reorderable (false); - list stupid_list; + edit_group_display.set_size_request (75, -1); - stupid_list.push_back ("*"); - stupid_list.push_back (_("-all-")); + edit_group_list_scroller.add (edit_group_display); + edit_group_list_scroller.set_policy (POLICY_AUTOMATIC, POLICY_AUTOMATIC); - edit_group_list.rows().push_back (stupid_list); - edit_group_list.rows().back().set_data (0); - edit_group_list.rows().back().select(); + edit_group_list_button.signal_clicked().connect (mem_fun(*this, &Editor::edit_group_list_button_clicked)); + edit_group_display.signal_button_press_event().connect (mem_fun(*this, &Editor::edit_group_list_button_press_event)); + edit_group_display.get_selection()->signal_changed().connect (mem_fun(*this, &Editor::edit_group_selection_changed)); + TreeModel::Row row = *(group_model->append()); + row[group_columns.is_active] = false; + row[group_columns.text] = (_("-all-")); + row[group_columns.routegroup] = 0; + edit_group_display.get_selection()->select (row); + edit_group_vbox.pack_start (edit_group_list_button, false, false); edit_group_vbox.pack_start (edit_group_list_scroller, true, true); - route_list_frame.set_name ("BaseFrame"); - route_list_frame.set_shadow_type (Gtk::SHADOW_IN); - route_list_frame.add (route_list_scroller); - - edit_group_list_frame.set_name ("BaseFrame"); - edit_group_list_frame.set_shadow_type (Gtk::SHADOW_IN); - edit_group_list_frame.add (edit_group_vbox); + region_list_display.set_size_request (100, -1); + region_list_display.set_name ("RegionListDisplay"); - route_group_vpane.add1 (route_list_frame); - route_group_vpane.add2 (edit_group_list_frame); + region_list_model = TreeStore::create (region_list_columns); + region_list_model->set_sort_func (0, mem_fun (*this, &Editor::region_list_sorter)); + region_list_model->set_sort_column (0, SORT_ASCENDING); - list_vpacker.pack_start (route_group_vpane, true, true); + region_list_display.set_model (region_list_model); + CellRendererText* renderer = manage( new CellRendererText() ); + region_list_display.append_column (_("Regions"), *renderer); + region_list_display.set_headers_visible (false); - region_list_hidden_node = region_list_display.rows().end(); + region_list_display.get_selection()->set_select_function (mem_fun (*this, &Editor::region_list_selection_filter)); + + TreeViewColumn* tv_col = region_list_display.get_column(0); + tv_col->add_attribute(renderer->property_text(), region_list_columns.name); + tv_col->add_attribute(renderer->property_foreground_gdk(), region_list_columns.color_); + + region_list_display.set_reorderable (true); - region_list_display.add_events (GDK_ENTER_NOTIFY_MASK|GDK_LEAVE_NOTIFY_MASK|Gdk::POINTER_MOTION_MASK); + region_list_display.get_selection()->set_mode (SELECTION_MULTIPLE); + region_list_display.add_object_drag (region_list_columns.region.index(), "regions"); - region_list_display.drag_dest_set (GTK_DEST_DEFAULT_ALL, - target_table, n_targets - 1, - GdkDragAction (Gdk::ACTION_COPY|Gdk::ACTION_MOVE)); - region_list_display.drag_data_received.connect (mem_fun(*this, &Editor::region_list_display_drag_data_received)); + /* setup DnD handling */ + + list region_list_target_table; + + region_list_target_table.push_back (TargetEntry ("text/plain")); + region_list_target_table.push_back (TargetEntry ("text/uri-list")); + region_list_target_table.push_back (TargetEntry ("application/x-rootwin-drop")); + + region_list_display.add_drop_targets (region_list_target_table); + region_list_display.signal_drag_data_received().connect (mem_fun(*this, &Editor::region_list_display_drag_data_received)); region_list_scroller.add (region_list_display); - region_list_scroller.set_policy (Gtk::POLICY_NEVER, Gtk::POLICY_AUTOMATIC); + region_list_scroller.set_policy (POLICY_NEVER, POLICY_AUTOMATIC); - region_list_display.set_name ("RegionListDisplay"); - region_list_display.set_size_request (100, -1); - region_list_display.column_titles_active (); - region_list_display.set_selection_mode (GTK_SELECTION_SINGLE); - - region_list_display.set_data ("editor", this); - region_list_display.set_compare_func (_region_list_sorter); - region_list_sort_type = ByName; - reset_region_list_sort_type (region_list_sort_type); - - region_list_display.set_flags (Gtk::CAN_FOCUS); - - region_list_display.key_press_event.connect (mem_fun(*this, &Editor::region_list_display_key_press)); - region_list_display.key_release_event.connect (mem_fun(*this, &Editor::region_list_display_key_release)); - region_list_display.button_press_event.connect (mem_fun(*this, &Editor::region_list_display_button_press)); - region_list_display.button_release_event.connect (mem_fun(*this, &Editor::region_list_display_button_release)); - region_list_display.motion_notify_event.connect (mem_fun(*this, &Editor::region_list_display_motion)); - region_list_display.enter_notify_event.connect (mem_fun(*this, &Editor::region_list_display_enter_notify)); - region_list_display.leave_notify_event.connect (mem_fun(*this, &Editor::region_list_display_leave_notify)); - region_list_display.select_row.connect (mem_fun(*this, &Editor::region_list_display_selected)); - region_list_display.unselect_row.connect (mem_fun(*this, &Editor::region_list_display_unselected)); - region_list_display.click_column.connect (mem_fun(*this, &Editor::region_list_column_click)); + region_list_display.signal_key_press_event().connect (mem_fun(*this, &Editor::region_list_display_key_press)); + region_list_display.signal_key_release_event().connect (mem_fun(*this, &Editor::region_list_display_key_release)); + region_list_display.signal_button_press_event().connect (mem_fun(*this, &Editor::region_list_display_button_press), false); + region_list_display.signal_button_release_event().connect (mem_fun(*this, &Editor::region_list_display_button_release)); + region_list_display.get_selection()->signal_changed().connect (mem_fun(*this, &Editor::region_list_selection_changed)); + // region_list_display.signal_popup_menu().connect (bind (mem_fun (*this, &Editor::show_region_list_display_context_menu), 1, 0)); named_selection_scroller.add (named_selection_display); - named_selection_scroller.set_policy (Gtk::POLICY_NEVER, Gtk::POLICY_AUTOMATIC); + named_selection_scroller.set_policy (POLICY_NEVER, POLICY_AUTOMATIC); - named_selection_display.set_name ("RegionListDisplay"); + named_selection_model = TreeStore::create (named_selection_columns); + named_selection_display.set_model (named_selection_model); + named_selection_display.append_column (_("Chunks"), named_selection_columns.text); + named_selection_display.set_headers_visible (false); named_selection_display.set_size_request (100, -1); - named_selection_display.column_titles_active (); - named_selection_display.set_selection_mode (GTK_SELECTION_SINGLE); - - named_selection_display.button_press_event.connect (mem_fun(*this, &Editor::named_selection_display_button_press)); - named_selection_display.select_row.connect (mem_fun(*this, &Editor::named_selection_display_selected)); - named_selection_display.unselect_row.connect (mem_fun(*this, &Editor::named_selection_display_unselected)); - - region_selection_vpane.pack1 (region_list_scroller, true, true); - region_selection_vpane.pack2 (named_selection_scroller, true, true); - - canvas_region_list_pane.pack1 (edit_frame, true, true); - canvas_region_list_pane.pack2 (region_selection_vpane, true, true); - - track_list_canvas_pane.size_allocate.connect_after (bind (mem_fun(*this, &Editor::pane_allocation_handler), - static_cast (&track_list_canvas_pane))); - canvas_region_list_pane.size_allocate.connect_after (bind (mem_fun(*this, &Editor::pane_allocation_handler), - static_cast (&canvas_region_list_pane))); - route_group_vpane.size_allocate.connect_after (bind (mem_fun(*this, &Editor::pane_allocation_handler), - static_cast (&route_group_vpane))); - region_selection_vpane.size_allocate.connect_after (bind (mem_fun(*this, &Editor::pane_allocation_handler), - static_cast (®ion_selection_vpane))); + named_selection_display.set_name ("RegionListDisplay"); - track_list_canvas_pane.pack1 (list_vpacker, true, true); - track_list_canvas_pane.pack2 (canvas_region_list_pane, true, true); + named_selection_display.get_selection()->set_mode (SELECTION_SINGLE); + named_selection_display.set_size_request (100, -1); + named_selection_display.signal_button_press_event().connect (mem_fun(*this, &Editor::named_selection_display_button_press), false); + named_selection_display.get_selection()->signal_changed().connect (mem_fun (*this, &Editor::named_selection_display_selection_changed)); - /* provide special pane-handle event handling for easy "hide" action */ + /* SNAPSHOTS */ - /* 0: collapse to show left/upper child - 1: collapse to show right/lower child - */ + snapshot_display_model = ListStore::create (snapshot_display_columns); + snapshot_display.set_model (snapshot_display_model); + snapshot_display.append_column (X_("snapshot"), snapshot_display_columns.visible_name); + snapshot_display.set_name ("SnapshotDisplayList"); + snapshot_display.set_size_request (75, -1); + snapshot_display.set_headers_visible (false); + snapshot_display.set_reorderable (false); + snapshot_display_scroller.add (snapshot_display); + snapshot_display_scroller.set_policy (Gtk::POLICY_NEVER, Gtk::POLICY_AUTOMATIC); - route_group_vpane.set_data ("collapse-direction", (gpointer) 0); - region_selection_vpane.set_data ("collapse-direction", (gpointer) 0); - canvas_region_list_pane.set_data ("collapse-direction", (gpointer) 0); - track_list_canvas_pane.set_data ("collapse-direction", (gpointer) 1); + snapshot_display.get_selection()->signal_changed().connect (mem_fun(*this, &Editor::snapshot_display_selection_changed)); + snapshot_display.signal_button_press_event().connect (mem_fun (*this, &Editor::snapshot_display_button_press), false); - route_group_vpane.button_release_event.connect (bind (ptr_fun (pane_handler), static_cast (&route_group_vpane))); - region_selection_vpane.button_release_event.connect (bind (ptr_fun (pane_handler), static_cast (®ion_selection_vpane))); - canvas_region_list_pane.button_release_event.connect (bind (ptr_fun (pane_handler), static_cast (&canvas_region_list_pane))); - track_list_canvas_pane.button_release_event.connect (bind (ptr_fun (pane_handler), static_cast (&track_list_canvas_pane))); + the_notebook.append_page (region_list_scroller, _("Regions")); + the_notebook.append_page (route_list_scroller, _("Tracks/Busses")); + the_notebook.append_page (snapshot_display_scroller, _("Snapshots")); + the_notebook.append_page (edit_group_vbox, _("Edit Groups")); + the_notebook.append_page (named_selection_scroller, _("Chunks")); + the_notebook.set_show_tabs (true); + the_notebook.set_scrollable (true); + the_notebook.popup_enable (); + + TearOff *notebook_tearoff = manage (new TearOff (the_notebook, true)); + notebook_tearoff->tearoff_window().set_size_request (200, 400); + + edit_pane.pack1 (edit_frame, true, true); + edit_pane.pack2 (*notebook_tearoff, true, true); + + edit_pane.signal_size_allocate().connect_notify (bind (mem_fun(*this, &Editor::pane_allocation_handler), static_cast (&edit_pane))); top_hbox.pack_start (toolbar_frame, true, true); HBox *hbox = manage (new HBox); - hbox->pack_start (track_list_canvas_pane, true, true); + hbox->pack_start (edit_pane, true, true); global_vpacker.pack_start (top_hbox, false, false); global_vpacker.pack_start (*hbox, true, true); @@ -702,18 +683,26 @@ Editor::Editor (AudioEngine& eng) global_hpacker.pack_start (global_vpacker, true, true); set_name ("EditorWindow"); + add_accel_group (ActionManager::ui_manager->get_accel_group()); vpacker.pack_end (global_hpacker, true, true); + + /* register actions now so that set_state() can find them and set toggles/checks etc */ + + register_actions (); + XMLNode* node = ARDOUR_UI::instance()->editor_settings(); + set_state (*node); + _playlist_selector = new PlaylistSelector(); - _playlist_selector->delete_event.connect (bind (ptr_fun (just_hide_it), static_cast (_playlist_selector))); + _playlist_selector->signal_delete_event().connect (bind (sigc::ptr_fun (just_hide_it), static_cast (_playlist_selector))); AudioRegionView::AudioRegionViewGoingAway.connect (mem_fun(*this, &Editor::catch_vanishing_audio_regionview)); /* nudge stuff */ - nudge_forward_button.add (*(manage (new Gtk::Image (right_arrow_xpm)))); - nudge_backward_button.add (*(manage (new Gtk::Image (left_arrow_xpm)))); + nudge_forward_button.add (*(manage (new Image (Gdk::Pixbuf::create_from_xpm_data(right_arrow_xpm))))); + nudge_backward_button.add (*(manage (new Image (Gdk::Pixbuf::create_from_xpm_data(left_arrow_xpm))))); ARDOUR_UI::instance()->tooltips().set_tip (nudge_forward_button, _("Nudge region/selection forwards")); ARDOUR_UI::instance()->tooltips().set_tip (nudge_backward_button, _("Nudge region/selection backwards")); @@ -723,16 +712,14 @@ Editor::Editor (AudioEngine& eng) fade_context_menu.set_name ("ArdourContextMenu"); - install_keybindings (); - set_title (_("ardour: editor")); set_wmclass (_("ardour_editor"), "Ardour"); add (vpacker); add_events (Gdk::KEY_PRESS_MASK|Gdk::KEY_RELEASE_MASK); - configure_event.connect (mem_fun (*ARDOUR_UI::instance(), &ARDOUR_UI::configure_handler)); - delete_event.connect (mem_fun (*ARDOUR_UI::instance(), &ARDOUR_UI::exit_on_main_window_close)); + signal_configure_event().connect (mem_fun (*ARDOUR_UI::instance(), &ARDOUR_UI::configure_handler)); + signal_delete_event().connect (mem_fun (*ARDOUR_UI::instance(), &ARDOUR_UI::exit_on_main_window_close)); constructed = true; instant_save (); @@ -814,369 +801,12 @@ Editor::left_track_canvas (GdkEventCrossing *ev) } -void -Editor::initialize_canvas () -{ - gnome_canvas_init (); - - track_gnome_canvas = gnome_canvas_new_aa (); - - /* adjust sensitivity for "picking" items */ - - // GNOME_CANVAS(track_gnome_canvas)->close_enough = 2; - - gtk_signal_connect (GTK_OBJECT(gnome_canvas_root (GNOME_CANVAS(track_gnome_canvas))), "event", - (GtkSignalFunc) Editor::_track_canvas_event, this); - track_canvas = wrap (track_gnome_canvas); - track_canvas->set_name ("EditorMainCanvas"); - - track_canvas->add_events (Gdk::POINTER_MOTION_HINT_MASK); - - track_canvas->leave_notify_event.connect (mem_fun(*this, &Editor::left_track_canvas)); - - /* set up drag-n-drop */ - - track_canvas->drag_dest_set (GTK_DEST_DEFAULT_ALL, - target_table, n_targets - 1, - GdkDragAction (Gdk::ACTION_COPY|Gdk::ACTION_MOVE)); - track_canvas->drag_data_received.connect (mem_fun(*this, &Editor::track_canvas_drag_data_received)); - - /* stuff for the verbose canvas cursor */ - - string fontname = get_font_for_style (N_("VerboseCanvasCursor")); - - verbose_canvas_cursor = gnome_canvas_item_new (gnome_canvas_root(GNOME_CANVAS(track_gnome_canvas)), - gnome_canvas_text_get_type(), - "font", fontname.c_str(), - "anchor", GTK_ANCHOR_NW, - "fill_color_rgba", color_map[cVerboseCanvasCursor], - NULL); - verbose_cursor_visible = false; - - /* a group to hold time (measure) lines */ - - time_line_group = gnome_canvas_item_new (gnome_canvas_root(GNOME_CANVAS(track_gnome_canvas)), - gnome_canvas_group_get_type(), - "x", 0.0, - "y", 0.0, - NULL); - - cursor_group = gnome_canvas_item_new (gnome_canvas_root(GNOME_CANVAS(track_gnome_canvas)), - gnome_canvas_group_get_type(), - "x", 0.0, - "y", 0.0, - NULL); - - time_gnome_canvas = gnome_canvas_new_aa (); - time_canvas = wrap (time_gnome_canvas); - time_canvas->set_name ("EditorTimeCanvas"); - - time_canvas->add_events (Gdk::POINTER_MOTION_HINT_MASK); - - meter_group = gnome_canvas_item_new (gnome_canvas_root(GNOME_CANVAS(time_gnome_canvas)), - gnome_canvas_group_get_type(), - "x", 0.0, - "y", 0.0, - NULL); - tempo_group = gnome_canvas_item_new (gnome_canvas_root(GNOME_CANVAS(time_gnome_canvas)), - gnome_canvas_group_get_type(), - "x", 0.0, - "y", timebar_height, - NULL); - marker_group = gnome_canvas_item_new (gnome_canvas_root(GNOME_CANVAS(time_gnome_canvas)), - gnome_canvas_group_get_type(), - "x", 0.0, - "y", timebar_height * 2.0, - NULL); - range_marker_group = gnome_canvas_item_new (gnome_canvas_root(GNOME_CANVAS(time_gnome_canvas)), - gnome_canvas_group_get_type(), - "x", 0.0, - "y", timebar_height * 3.0, - NULL); - transport_marker_group = gnome_canvas_item_new (gnome_canvas_root(GNOME_CANVAS(time_gnome_canvas)), - gnome_canvas_group_get_type(), - "x", 0.0, - "y", timebar_height * 4.0, - NULL); - - tempo_bar = gnome_canvas_item_new (GNOME_CANVAS_GROUP(tempo_group), - gnome_canvas_simplerect_get_type(), - "x1", 0.0, - "y1", 0.0, - "x2", max_canvas_coordinate, - "y2", timebar_height, - "fill_color_rgba", color_map[cTempoBar], - "outline_pixels", 0, - NULL); - meter_bar = gnome_canvas_item_new (GNOME_CANVAS_GROUP(meter_group), - gnome_canvas_simplerect_get_type(), - "x1", 0.0, - "y1", 0.0, - "x2", max_canvas_coordinate, - "y2", timebar_height, - "fill_color_rgba", color_map[cMeterBar], - "outline_pixels", 0, - NULL); - marker_bar = gnome_canvas_item_new (GNOME_CANVAS_GROUP(marker_group), - gnome_canvas_simplerect_get_type(), - "x1", 0.0, - "y1", 0.0, - "x2", max_canvas_coordinate, - "y2", timebar_height, - "fill_color_rgba", color_map[cMarkerBar], - "outline_pixels", 0, - NULL); - range_marker_bar = gnome_canvas_item_new (GNOME_CANVAS_GROUP(range_marker_group), - gnome_canvas_simplerect_get_type(), - "x1", 0.0, - "y1", 0.0, - "x2", max_canvas_coordinate, - "y2", timebar_height, - "fill_color_rgba", color_map[cRangeMarkerBar], - "outline_pixels", 0, - NULL); - transport_marker_bar = gnome_canvas_item_new (GNOME_CANVAS_GROUP(transport_marker_group), - gnome_canvas_simplerect_get_type(), - "x1", 0.0, - "y1", 0.0, - "x2", max_canvas_coordinate, - "y2", timebar_height, - "fill_color_rgba", color_map[cTransportMarkerBar], - "outline_pixels", 0, - NULL); - - range_bar_drag_rect = gnome_canvas_item_new (GNOME_CANVAS_GROUP(range_marker_group), - gnome_canvas_simplerect_get_type(), - "x1", 0.0, - "y1", 0.0, - "x2", 0.0, - "y2", timebar_height, - "fill_color_rgba", color_map[cRangeDragBarRectFill], - "outline_color_rgba", color_map[cRangeDragBarRect], - NULL); - gnome_canvas_item_hide (range_bar_drag_rect); - - transport_bar_drag_rect = gnome_canvas_item_new (GNOME_CANVAS_GROUP(transport_marker_group), - gnome_canvas_simplerect_get_type(), - "x1", 0.0, - "y1", 0.0, - "x2", 0.0, - "y2", timebar_height, - "fill_color_rgba", color_map[cTransportDragRectFill], - "outline_color_rgba", color_map[cTransportDragRect], - NULL); - gnome_canvas_item_hide (transport_bar_drag_rect); - - - marker_drag_line_points = gnome_canvas_points_new (2); - marker_drag_line_points->coords[0] = 0.0; - marker_drag_line_points->coords[1] = 0.0; - marker_drag_line_points->coords[2] = 0.0; - marker_drag_line_points->coords[3] = 0.0; - - - //cerr << "set mdl points, nc = " << marker_drag_line_points->num_points << endl; - marker_drag_line = gnome_canvas_item_new (gnome_canvas_root(GNOME_CANVAS(track_gnome_canvas)), - gnome_canvas_line_get_type(), - "width_pixels", 1, - "fill_color_rgba", color_map[cMarkerDragLine], - "points", marker_drag_line_points, - NULL); - gnome_canvas_item_hide (marker_drag_line); - - range_marker_drag_rect = gnome_canvas_item_new (gnome_canvas_root(GNOME_CANVAS(track_gnome_canvas)), - gnome_canvas_simplerect_get_type(), - "x1", 0.0, - "y1", 0.0, - "x2", 0.0, - "y2", 0.0, - "fill_color_rgba", color_map[cRangeDragRectFill], - "outline_color_rgba", color_map[cRangeDragRect], - NULL); - gnome_canvas_item_hide (range_marker_drag_rect); - - - transport_loop_range_rect = gnome_canvas_item_new ((GNOME_CANVAS_GROUP(time_line_group)), - gnome_canvas_simplerect_get_type(), - "x1", 0.0, - "y1", 0.0, - "x2", 0.0, - "y2", 0.0, - "fill_color_rgba", color_map[cTransportLoopRectFill], - "outline_color_rgba", color_map[cTransportLoopRect], - "outline_pixels", 1, - NULL); - gnome_canvas_item_hide (transport_loop_range_rect); - - transport_punch_range_rect = gnome_canvas_item_new ((GNOME_CANVAS_GROUP(time_line_group)), - gnome_canvas_simplerect_get_type(), - "x1", 0.0, - "y1", 0.0, - "x2", 0.0, - "y2", 0.0, - "fill_color_rgba", color_map[cTransportPunchRectFill], - "outline_color_rgba", color_map[cTransportPunchRect], - "outline_pixels", 0, - NULL); - gnome_canvas_item_lower_to_bottom (transport_punch_range_rect); - gnome_canvas_item_lower_to_bottom (transport_loop_range_rect); // loop on the bottom - gnome_canvas_item_hide (transport_punch_range_rect); - - transport_punchin_line = gnome_canvas_item_new ((GNOME_CANVAS_GROUP(time_line_group)), - gnome_canvas_simplerect_get_type(), - "x1", 0.0, - "y1", 0.0, - "x2", 0.0, - "y2", 0.0, - "outline_color_rgba", color_map[cPunchInLine], - "outline_pixels", 1, - NULL); - gnome_canvas_item_hide (transport_punchin_line); - - transport_punchout_line = gnome_canvas_item_new ((GNOME_CANVAS_GROUP(time_line_group)), - gnome_canvas_simplerect_get_type(), - "x1", 0.0, - "y1", 0.0, - "x2", 0.0, - "y2", 0.0, - "outline_color_rgba", color_map[cPunchOutLine], - "outline_pixels", 1, - NULL); - gnome_canvas_item_hide (transport_punchout_line); - - - - - // used to show zoom mode active zooming - zoom_rect = gnome_canvas_item_new (gnome_canvas_root(GNOME_CANVAS(track_gnome_canvas)), - gnome_canvas_simplerect_get_type(), - "x1", 0.0, - "y1", 0.0, - "x2", 0.0, - "y2", 0.0, - "fill_color_rgba", color_map[cZoomRectFill], - "outline_color_rgba", color_map[cZoomRect], - "outline_pixels", 1, - NULL); - gnome_canvas_item_hide (zoom_rect); - gtk_signal_connect (GTK_OBJECT(zoom_rect), "event", - (GtkSignalFunc) PublicEditor::canvas_zoom_rect_event, - this); - - // used as rubberband rect - rubberband_rect = gnome_canvas_item_new (gnome_canvas_root(GNOME_CANVAS(track_gnome_canvas)), - gnome_canvas_simplerect_get_type(), - "x1", 0.0, - "y1", 0.0, - "x2", 0.0, - "y2", 0.0, - "outline_color_rgba", color_map[cRubberBandRect], - "fill_color_rgba", (guint32) color_map[cRubberBandRectFill], - "outline_pixels", 1, - NULL); - gnome_canvas_item_hide (rubberband_rect); - - - - gtk_signal_connect (GTK_OBJECT(tempo_bar), "event", - (GtkSignalFunc) PublicEditor::canvas_tempo_bar_event, - this); - - gtk_signal_connect (GTK_OBJECT(meter_bar), "event", - (GtkSignalFunc) PublicEditor::canvas_meter_bar_event, - this); - - gtk_signal_connect (GTK_OBJECT(marker_bar), "event", - (GtkSignalFunc) PublicEditor::canvas_marker_bar_event, - this); - - gtk_signal_connect (GTK_OBJECT(range_marker_bar), "event", - (GtkSignalFunc) PublicEditor::canvas_range_marker_bar_event, - this); - - gtk_signal_connect (GTK_OBJECT(transport_marker_bar), "event", - (GtkSignalFunc) PublicEditor::canvas_transport_marker_bar_event, - this); - - /* separator lines */ - - tempo_line_points = gnome_canvas_points_new (2); - tempo_line_points->coords[0] = 0; - tempo_line_points->coords[1] = timebar_height; - tempo_line_points->coords[2] = max_canvas_coordinate; - tempo_line_points->coords[3] = timebar_height; - //cerr << "set tl points, nc = " << tempo_line_points->num_points << endl; - tempo_line = gnome_canvas_item_new (GNOME_CANVAS_GROUP(tempo_group), - gnome_canvas_line_get_type(), - "width_pixels", 0, - "fill_color", "black", - "points", tempo_line_points, - NULL); - - // cerr << "tempo line @ " << tempo_line << endl; - - meter_line_points = gnome_canvas_points_new (2); - meter_line_points->coords[0] = 0; - meter_line_points->coords[1] = timebar_height; - meter_line_points->coords[2] = max_canvas_coordinate; - meter_line_points->coords[3] = timebar_height; - // cerr << "set ml points, nc = " << tempo_line_points->num_points << endl; - meter_line = gnome_canvas_item_new (GNOME_CANVAS_GROUP(meter_group), - gnome_canvas_line_get_type(), - "width_pixels", 0, - "fill_color", "black", - "points", meter_line_points, - NULL); - - // cerr << "meter line @ " << tempo_line << endl; - - marker_line_points = gnome_canvas_points_new (2); - marker_line_points->coords[0] = 0; - marker_line_points->coords[1] = timebar_height; - marker_line_points->coords[2] = max_canvas_coordinate; - marker_line_points->coords[3] = timebar_height; - // cerr << "set ml2 points, nc = " << marker_line_points->num_points << endl; - marker_line = gnome_canvas_item_new (GNOME_CANVAS_GROUP(marker_group), - gnome_canvas_line_get_type(), - "width_pixels", 0, - "fill_color", "black", - "points", marker_line_points, - NULL); - // cerr << "set rml points, nc = " << marker_line_points->num_points << endl; - range_marker_line = gnome_canvas_item_new (GNOME_CANVAS_GROUP(range_marker_group), - gnome_canvas_line_get_type(), - "width_pixels", 0, - "fill_color", "black", - "points", marker_line_points, - NULL); - // cerr << "set tml2 points, nc = " << marker_line_points->num_points << endl; - transport_marker_line = gnome_canvas_item_new (GNOME_CANVAS_GROUP(transport_marker_group), - gnome_canvas_line_get_type(), - "width_pixels", 0, - "fill_color", "black", - "points", marker_line_points, - NULL); - - // cerr << "marker line @ " << marker_line << endl; - - ZoomChanged.connect (bind (mem_fun(*this, &Editor::update_loop_range_view), false)); - ZoomChanged.connect (bind (mem_fun(*this, &Editor::update_punch_range_view), false)); - - double time_height = timebar_height * 5; - double time_width = FLT_MAX/frames_per_unit; - gnome_canvas_set_scroll_region (GNOME_CANVAS(time_gnome_canvas), 0.0, 0.0, time_width, time_height); - - edit_cursor = new Cursor (*this, "blue", (GtkSignalFunc) _canvas_edit_cursor_event); - playhead_cursor = new Cursor (*this, "red", (GtkSignalFunc) _canvas_playhead_cursor_event); - - track_canvas->size_allocate.connect (mem_fun(*this, &Editor::track_canvas_allocate)); -} - void Editor::show_window () { show_all (); - + present (); + /* now reset all audio_time_axis heights, because widgets might need to be re-hidden */ @@ -1192,9 +822,8 @@ Editor::show_window () void Editor::tie_vertical_scrolling () { - edit_controls_scroller.get_vadjustment()->set_value (track_canvas_scroller.get_vadjustment()->get_value()); - - float y1 = track_canvas_scroller.get_vadjustment()->get_value(); + double y1 = vertical_adjustment.get_value(); + controls_layout.get_vadjustment()->set_value (y1); playhead_cursor->set_y_axis(y1); edit_cursor->set_y_axis(y1); } @@ -1214,7 +843,7 @@ Editor::set_frames_per_unit (double fpu) // convert fpu to frame count - frames = (jack_nframes_t) (fpu * canvas_width); + frames = (jack_nframes_t) floor (fpu * canvas_width); /* don't allow zooms that fit more than the maximum number of frames into an 800 pixel wide space. @@ -1235,12 +864,11 @@ Editor::set_frames_per_unit (double fpu) */ if (session) { - track_canvas_scroller.get_hadjustment()->set_upper (session->current_end_frame() / frames_per_unit); + horizontal_adjustment.set_upper (session->current_end_frame() / frames_per_unit); } if (!no_zoom_repos_update) { - track_canvas_scroller.get_hadjustment()->set_value (leftmost_frame/frames_per_unit); - update_hscroller (); + horizontal_adjustment.set_value (leftmost_frame/frames_per_unit); update_fixed_rulers (); tempo_map_changed (Change (0)); } @@ -1280,10 +908,10 @@ Editor::reposition_x_origin (jack_nframes_t frame) if (frame != leftmost_frame) { leftmost_frame = frame; double pixel = frame_to_pixel (frame); - if (pixel >= track_canvas_scroller.get_hadjustment()->get_upper()) { - track_canvas_scroller.get_hadjustment()->set_upper (frame_to_pixel (frame + (current_page_frames()))); + if (pixel >= horizontal_adjustment.get_upper()) { + horizontal_adjustment.set_upper (frame_to_pixel (frame + (current_page_frames()))); } - track_canvas_scroller.get_hadjustment()->set_value (frame/frames_per_unit); + horizontal_adjustment.set_value (frame/frames_per_unit); XOriginChanged (); /* EMIT_SIGNAL */ } } @@ -1304,15 +932,14 @@ Editor::zoom_adjustment_changed () return; } - double fpu = (double) zoom_range_clock.current_duration() / (double) canvas_width; + double fpu = zoom_range_clock.current_duration() / canvas_width; if (fpu < 1.0) { fpu = 1.0; - zoom_range_clock.set ((jack_nframes_t) (fpu * canvas_width)); - } - else if (fpu > session->current_end_frame() / (double) canvas_width) { - fpu = session->current_end_frame() / (double) canvas_width; - zoom_range_clock.set ((jack_nframes_t) (fpu * canvas_width)); + zoom_range_clock.set ((jack_nframes_t) floor (fpu * canvas_width)); + } else if (fpu > session->current_end_frame() / canvas_width) { + fpu = session->current_end_frame() / canvas_width; + zoom_range_clock.set ((jack_nframes_t) floor (fpu * canvas_width)); } temporal_zoom (fpu); @@ -1321,14 +948,8 @@ Editor::zoom_adjustment_changed () void Editor::canvas_horizontally_scrolled () { - /* XXX note the potential loss of accuracy here caused by - adjustments being 32bit floats with only a 24 bit mantissa, - whereas jack_nframes_t is at least a 32 bit uint32_teger. - */ - - leftmost_frame = (jack_nframes_t) floor (track_canvas_scroller.get_hadjustment()->get_value() * frames_per_unit); + leftmost_frame = (jack_nframes_t) floor (horizontal_adjustment.get_value() * frames_per_unit); - update_hscroller (); update_fixed_rulers (); if (!edit_hscroll_dragging) { @@ -1342,7 +963,7 @@ void Editor::reposition_and_zoom (jack_nframes_t frame, double nfpu) { if (!repos_zoom_queued) { - Main::idle.connect (bind (mem_fun(*this, &Editor::deferred_reposition_and_zoom), frame, nfpu)); + Glib::signal_idle().connect (bind (mem_fun(*this, &Editor::deferred_reposition_and_zoom), frame, nfpu)); repos_zoom_queued = true; } } @@ -1367,202 +988,10 @@ Editor::deferred_reposition_and_zoom (jack_nframes_t frame, double nfpu) } void -Editor::realize_impl () -{ - /* Even though we're not using acceleration, we want the - labels to show up. - */ - - track_context_menu.accelerate (*this->get_toplevel()); - track_region_context_menu.accelerate (*this->get_toplevel()); - - Window::realize_impl (); - - GdkPixmap* empty_pixmap = gdk_pixmap_new (get_window(), 1, 1, 1); - GdkPixmap* empty_bitmap = gdk_pixmap_new (get_window(), 1, 1, 1); - GdkColor white = { 0, 0, 0 }; - - null_cursor = gdk_cursor_new_from_pixmap (empty_pixmap, empty_bitmap, &white, &white, 0, 0); -} - -void -Editor::map__impl () +Editor::on_realize () { - Window::map__impl (); - - track_canvas_scroller.get_window().set_cursor (current_canvas_cursor); - time_canvas_scroller.get_window().set_cursor (timebar_cursor); -} - -void -Editor::track_canvas_allocate (GtkAllocation *alloc) -{ - canvas_width = alloc->width; - canvas_height = alloc->height; - - if (session == 0 && !ARDOUR_UI::instance()->will_create_new_session_automatically()) { - - string fontname = get_font_for_style (N_("FirstActionMessage")); - - const char *txt1 = _("Start a new session\n"); - const char *txt2 = _("via Session menu"); - - /* this mess of code is here to find out how wide this text is and - position the message in the center of the editor window. there - are two lines, so we use the longer of the the lines to - compute width, and multiply the height by 2. - */ - - gint width; - gint lbearing; - gint rbearing; - gint ascent; - gint descent; - - /* this is a dummy widget that exists so that we can get the - style from the RC file. - */ - - Label foo (_(txt2)); - foo.set_name ("NoSessionMessage"); - foo.ensure_style (); - - gdk_string_extents (foo.get_style()->get_font(), - _(txt2), - &lbearing, - &rbearing, - &width, - &ascent, - &descent); - - if (first_action_message == 0) { - - char txt[strlen(txt1)+strlen(txt2)+1]; - - /* merge both lines */ - - strcpy (txt, _(txt1)); - strcat (txt, _(txt2)); - - first_action_message = gnome_canvas_item_new (gnome_canvas_root(GNOME_CANVAS(track_gnome_canvas)), - gnome_canvas_text_get_type(), - "font", fontname.c_str(), - "fill_color_rgba", color_map[cFirstActionMessage], - "x", (gdouble) (canvas_width - width) / 2.0, - "y", (gdouble) (canvas_height/2.0) - (2.0 * (ascent+descent)), - "anchor", GTK_ANCHOR_NORTH_WEST, - "text", txt, - NULL); - - } else { - - /* center it */ - - gnome_canvas_item_set (first_action_message, - "x", (gdouble) (canvas_width - width) / 2.0, - "y", (gdouble) (canvas_height/2.0) - (2.0 * (ascent+descent)), - NULL); - } - } - - zoom_range_clock.set ((jack_nframes_t) (canvas_width * frames_per_unit)); - edit_cursor->set_position (edit_cursor->current_frame); - playhead_cursor->set_position (playhead_cursor->current_frame); - reset_scrolling_region (alloc); - - Resized (); /* EMIT_SIGNAL */ -} - -void -Editor::reset_scrolling_region (GtkAllocation *alloc) -{ - guint32 last_canvas_unit; - double height; - guint32 canvas_alloc_height, canvas_alloc_width; - TrackViewList::iterator i; - static bool first_time = true; - - /* We need to make sure that the canvas always has its - scrolling region set to larger of: - - - the size allocated for it (within the container its packed in) - - the size required to see the entire session - - If we don't ensure at least the first of these, the canvas - does some wierd and in my view unnecessary stuff to center - itself within the allocated area, which causes bad, bad - results. - - XXX GnomeCanvas has fixed this, and has an option to - control the centering behaviour. - */ - - last_canvas_unit = (guint32) ceil ((float) max_frames / frames_per_unit); - - height = 0; - - if (session) { - for (i = track_views.begin(); i != track_views.end(); ++i) { - if ((*i)->control_parent) { - height += (*i)->effective_height; - height += track_spacing; - } - } - - if (height) { - height -= track_spacing; - } - } - - canvas_height = (guint32) height; - - if (alloc) { - canvas_alloc_height = alloc->height; - canvas_alloc_width = alloc->width; - } else { - canvas_alloc_height = track_gnome_canvas->allocation.height; - canvas_alloc_width = track_gnome_canvas->allocation.width; - } - - canvas_height = max (canvas_height, canvas_alloc_height); - - gnome_canvas_set_scroll_region (GNOME_CANVAS(track_gnome_canvas), 0.0, 0.0, - max (last_canvas_unit, canvas_alloc_width), - canvas_height); - - if (edit_cursor) edit_cursor->set_length (canvas_alloc_height); - if (playhead_cursor) playhead_cursor->set_length (canvas_alloc_height); - - if (marker_drag_line) { - marker_drag_line_points->coords[3] = canvas_height; - // cerr << "set mlA points, nc = " << marker_drag_line_points->num_points << endl; - gnome_canvas_item_set (marker_drag_line, "points", marker_drag_line_points, NULL); - } - if (range_marker_drag_rect) { - gnome_canvas_item_set (range_marker_drag_rect, "y1", 0.0, "y2", (double) canvas_height, NULL); - } - if (transport_loop_range_rect) { - gnome_canvas_item_set (transport_loop_range_rect, "y1", 0.0, "y2", (double) canvas_height, NULL); - } - if (transport_punch_range_rect) { - gnome_canvas_item_set (transport_punch_range_rect, "y1", 0.0, "y2", (double) canvas_height, NULL); - } - if (transport_punchin_line) { - gnome_canvas_item_set (transport_punchin_line, "y1", 0.0, "y2", (double) canvas_height, NULL); - } - if (transport_punchout_line) { - gnome_canvas_item_set (transport_punchout_line, "y1", 0.0, "y2", (double) canvas_height, NULL); - } - - - update_fixed_rulers (); - - if (is_visible() && first_time) { - tempo_map_changed (Change (0)); - first_time = false; - } else { - redisplay_tempo (); - } + Window::on_realize (); + Realized (); } void @@ -1647,13 +1076,13 @@ Editor::map_position_change (jack_nframes_t frame) void Editor::center_screen (jack_nframes_t frame) { - float page = canvas_width * frames_per_unit; + double page = canvas_width * frames_per_unit; /* if we're off the page, then scroll. */ if (frame < leftmost_frame || frame >= leftmost_frame + page) { - center_screen_internal (frame,page); + center_screen_internal (frame, page); } } @@ -1677,15 +1106,13 @@ Editor::handle_new_duration () reset_scrolling_region (); if (session) { - track_canvas_scroller.get_hadjustment()->set_upper (session->current_end_frame() / frames_per_unit); - track_canvas_scroller.get_hadjustment()->set_value (leftmost_frame/frames_per_unit); + horizontal_adjustment.set_upper (session->current_end_frame() / frames_per_unit); + horizontal_adjustment.set_value (leftmost_frame/frames_per_unit); } - - update_hscroller (); } void -Editor::update_title_s (string snap_name) +Editor::update_title_s (const string & snap_name) { ENSURE_GUI_THREAD(bind (mem_fun(*this, &Editor::update_title_s), snap_name)); @@ -1727,11 +1154,9 @@ Editor::connect_to_session (Session *t) session = t; if (first_action_message) { - gnome_canvas_item_hide (first_action_message); + first_action_message->hide(); } - flush_track_canvas(); - update_title (); session->going_away.connect (mem_fun(*this, &Editor::session_going_away)); @@ -1762,7 +1187,7 @@ Editor::connect_to_session (Session *t) session->foreach_edit_group(this, &Editor::add_edit_group); - editor_mixer_button.toggled.connect (mem_fun(*this, &Editor::editor_mixer_button_toggled)); + editor_mixer_button.signal_toggled().connect (mem_fun(*this, &Editor::editor_mixer_button_toggled)); editor_mixer_button.set_name (X_("EditorMixerButton")); edit_cursor_clock.set_session (session); @@ -1774,11 +1199,11 @@ Editor::connect_to_session (Session *t) switch (session->get_edit_mode()) { case Splice: - edit_mode_selector.get_entry()->set_text (edit_mode_strings[splice_index]); + edit_mode_selector.set_active_text (edit_mode_strings[splice_index]); break; case Slide: - edit_mode_selector.get_entry()->set_text (edit_mode_strings[slide_index]); + edit_mode_selector.set_active_text (edit_mode_strings[slide_index]); break; } @@ -1814,7 +1239,7 @@ Editor::connect_to_session (Session *t) update_punch_range_view (true); session->ControlChanged.connect (mem_fun(*this, &Editor::queue_session_control_changed)); - + session->StateSaved.connect (mem_fun(*this, &Editor::session_state_saved)); refresh_location_display (); session->locations()->added.connect (mem_fun(*this, &Editor::add_new_location)); @@ -1827,21 +1252,13 @@ Editor::connect_to_session (Session *t) redisplay_regions (); redisplay_named_selections (); + redisplay_snapshots (); - route_list.freeze (); - route_list.clear (); + route_display_model->clear (); + no_route_list_redisplay = true; session->foreach_route (this, &Editor::handle_new_route); - // route_list.select_all (); - route_list.sort (); - route_list_reordered (); - route_list.thaw (); - - if (embed_audio_item) { - embed_audio_item->set_sensitive (true); - } - if (import_audio_item) { - import_audio_item->set_sensitive (true); - } + no_route_list_redisplay = false; + route_list_display.get_selection()->select_all (); for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) { (static_cast(*i))->set_samples_per_unit (frames_per_unit); @@ -1854,10 +1271,9 @@ Editor::connect_to_session (Session *t) leftmost_frame = 0; - track_canvas_scroller.get_hadjustment()->set_upper (session->current_end_frame() / frames_per_unit); - track_canvas_scroller.get_hadjustment()->set_value (0); + horizontal_adjustment.set_upper (session->current_end_frame() / frames_per_unit); + horizontal_adjustment.set_value (0); - update_hscroller (); restore_ruler_visibility (); tempo_map_changed (Change (0)); @@ -1873,85 +1289,74 @@ Editor::connect_to_session (Session *t) if (ARDOUR_UI::instance()->session_is_new ()) { - Gtk::CList_Helpers::RowList::iterator i; - Gtk::CList_Helpers::RowList& rowlist = route_list.rows(); - - route_list.freeze (); + TreeModel::Children rows = route_display_model->children(); + TreeModel::Children::iterator i; + + //route_list_display.freeze (); - for (i = rowlist.begin(); i != rowlist.end(); ++i) { - TimeAxisView *tv = (TimeAxisView *) i->get_data (); + for (i = rows.begin(); i != rows.end(); ++i) { + TimeAxisView *tv = (*i)[route_display_columns.tv]; AudioTimeAxisView *atv; if ((atv = dynamic_cast(tv)) != 0) { if (atv->route().master()) { - (*i)->unselect (); + route_list_display.get_selection()->unselect (i); + //(*i)->unselect (); } } } - route_list.thaw (); + //route_list_display.thaw (); } } void Editor::build_cursors () { - GdkPixmap *source, *mask; - GdkColor fg = { 0, 65535, 0, 0 }; /* Red. */ - GdkColor bg = { 0, 0, 0, 65535 }; /* Blue. */ + using namespace Gdk; - source = gdk_bitmap_create_from_data (NULL, hand_bits, - hand_width, hand_height); - mask = gdk_bitmap_create_from_data (NULL, handmask_bits, - handmask_width, handmask_height); - grabber_cursor = gdk_cursor_new_from_pixmap (source, mask, &fg, &bg, hand_x_hot, hand_y_hot); - gdk_pixmap_unref (source); - gdk_pixmap_unref (mask); + Gdk::Color mbg ("#000000" ); /* Black */ + Gdk::Color mfg ("#0000ff" ); /* Blue. */ + { + RefPtr source, mask; + source = Bitmap::create (mag_bits, mag_width, mag_height); + mask = Bitmap::create (magmask_bits, mag_width, mag_height); + zoom_cursor = new Gdk::Cursor (source, mask, mfg, mbg, mag_x_hot, mag_y_hot); + } - GdkColor mbg = { 0, 0, 0, 0 }; /* Black */ - GdkColor mfg = { 0, 0, 0, 65535 }; /* Blue. */ + Gdk::Color fbg ("#ffffff" ); + Gdk::Color ffg ("#000000" ); - source = gdk_bitmap_create_from_data (NULL, mag_bits, - mag_width, mag_height); - mask = gdk_bitmap_create_from_data (NULL, magmask_bits, - mag_width, mag_height); - zoom_cursor = gdk_cursor_new_from_pixmap (source, mask, &mfg, &mbg, mag_x_hot, mag_y_hot); - gdk_pixmap_unref (source); - gdk_pixmap_unref (mask); - - GdkColor fbg = { 0, 65535, 65535, 65535 }; - GdkColor ffg = { 0, 0, 0, 0 }; + { + RefPtr source, mask; + + source = Bitmap::create (fader_cursor_bits, fader_cursor_width, fader_cursor_height); + mask = Bitmap::create (fader_cursor_mask_bits, fader_cursor_width, fader_cursor_height); + fader_cursor = new Gdk::Cursor (source, mask, ffg, fbg, fader_cursor_x_hot, fader_cursor_y_hot); + } - source = gdk_bitmap_create_from_data (NULL, fader_cursor_bits, - fader_cursor_width, fader_cursor_height); - mask = gdk_bitmap_create_from_data (NULL, fader_cursor_mask_bits, - fader_cursor_width, fader_cursor_height); - fader_cursor = gdk_cursor_new_from_pixmap (source, mask, &ffg, &fbg, fader_cursor_x_hot, fader_cursor_y_hot); - gdk_pixmap_unref (source); - gdk_pixmap_unref (mask); - - source = gdk_bitmap_create_from_data (NULL, speaker_cursor_bits, - speaker_cursor_width, speaker_cursor_height); - mask = gdk_bitmap_create_from_data (NULL, speaker_cursor_mask_bits, - speaker_cursor_width, speaker_cursor_height); - speaker_cursor = gdk_cursor_new_from_pixmap (source, mask, &ffg, &fbg, speaker_cursor_x_hot, speaker_cursor_y_hot); - gdk_pixmap_unref (source); - gdk_pixmap_unref (mask); - - cross_hair_cursor = gdk_cursor_new (GDK_CROSSHAIR); - trimmer_cursor = gdk_cursor_new (GDK_SB_H_DOUBLE_ARROW); - selector_cursor = gdk_cursor_new (GDK_XTERM); - time_fx_cursor = gdk_cursor_new (GDK_SIZING); - wait_cursor = gdk_cursor_new (GDK_WATCH); - timebar_cursor = gdk_cursor_new (GDK_LEFT_PTR); + { + RefPtr source, mask; + source = Bitmap::create (speaker_cursor_bits, speaker_cursor_width, speaker_cursor_height); + mask = Bitmap::create (speaker_cursor_mask_bits, speaker_cursor_width, speaker_cursor_height); + speaker_cursor = new Gdk::Cursor (source, mask, ffg, fbg, speaker_cursor_x_hot, speaker_cursor_y_hot); + } + + grabber_cursor = new Gdk::Cursor (HAND2); + cross_hair_cursor = new Gdk::Cursor (CROSSHAIR); + trimmer_cursor = new Gdk::Cursor (SB_H_DOUBLE_ARROW); + selector_cursor = new Gdk::Cursor (XTERM); + time_fx_cursor = new Gdk::Cursor (SIZING); + wait_cursor = new Gdk::Cursor (WATCH); + timebar_cursor = new Gdk::Cursor(LEFT_PTR); } void -Editor::popup_fade_context_menu (int button, int32_t time, GnomeCanvasItem* item, ItemType item_type) +Editor::popup_fade_context_menu (int button, int32_t time, ArdourCanvas::Item* item, ItemType item_type) { using namespace Menu_Helpers; - AudioRegionView* arv = static_cast (gtk_object_get_data (GTK_OBJECT(item), "regionview")); + AudioRegionView* arv = static_cast (item->get_data ("regionview")); if (arv == 0) { fatal << _("programming error: fade in canvas item has no regionview data pointer!") << endmsg; @@ -1966,35 +1371,35 @@ Editor::popup_fade_context_menu (int button, int32_t time, GnomeCanvasItem* item case FadeInItem: case FadeInHandleItem: if (arv->region.fade_in_active()) { - items.push_back (MenuElem (_("Deactivate"), bind (slot (*arv, &AudioRegionView::set_fade_in_active), false))); + items.push_back (MenuElem (_("Deactivate"), bind (mem_fun (*arv, &AudioRegionView::set_fade_in_active), false))); } else { - items.push_back (MenuElem (_("Activate"), bind (slot (*arv, &AudioRegionView::set_fade_in_active), true))); + items.push_back (MenuElem (_("Activate"), bind (mem_fun (*arv, &AudioRegionView::set_fade_in_active), true))); } items.push_back (SeparatorElem()); - items.push_back (MenuElem (_("Linear"), bind (slot (arv->region, &AudioRegion::set_fade_in_shape), AudioRegion::Linear))); - items.push_back (MenuElem (_("Slowest"), bind (slot (arv->region, &AudioRegion::set_fade_in_shape), AudioRegion::LogB))); - items.push_back (MenuElem (_("Slow"), bind (slot (arv->region, &AudioRegion::set_fade_in_shape), AudioRegion::Fast))); - items.push_back (MenuElem (_("Fast"), bind (slot (arv->region, &AudioRegion::set_fade_in_shape), AudioRegion::LogA))); - items.push_back (MenuElem (_("Fastest"), bind (slot (arv->region, &AudioRegion::set_fade_in_shape), AudioRegion::Slow))); + items.push_back (MenuElem (_("Linear"), bind (mem_fun (arv->region, &AudioRegion::set_fade_in_shape), AudioRegion::Linear))); + items.push_back (MenuElem (_("Slowest"), bind (mem_fun (arv->region, &AudioRegion::set_fade_in_shape), AudioRegion::LogB))); + items.push_back (MenuElem (_("Slow"), bind (mem_fun (arv->region, &AudioRegion::set_fade_in_shape), AudioRegion::Fast))); + items.push_back (MenuElem (_("Fast"), bind (mem_fun (arv->region, &AudioRegion::set_fade_in_shape), AudioRegion::LogA))); + items.push_back (MenuElem (_("Fastest"), bind (mem_fun (arv->region, &AudioRegion::set_fade_in_shape), AudioRegion::Slow))); break; case FadeOutItem: case FadeOutHandleItem: if (arv->region.fade_out_active()) { - items.push_back (MenuElem (_("Deactivate"), bind (slot (*arv, &AudioRegionView::set_fade_out_active), false))); + items.push_back (MenuElem (_("Deactivate"), bind (mem_fun (*arv, &AudioRegionView::set_fade_out_active), false))); } else { - items.push_back (MenuElem (_("Activate"), bind (slot (*arv, &AudioRegionView::set_fade_out_active), true))); + items.push_back (MenuElem (_("Activate"), bind (mem_fun (*arv, &AudioRegionView::set_fade_out_active), true))); } items.push_back (SeparatorElem()); - items.push_back (MenuElem (_("Linear"), bind (slot (arv->region, &AudioRegion::set_fade_out_shape), AudioRegion::Linear))); - items.push_back (MenuElem (_("Slowest"), bind (slot (arv->region, &AudioRegion::set_fade_out_shape), AudioRegion::Fast))); - items.push_back (MenuElem (_("Slow"), bind (slot (arv->region, &AudioRegion::set_fade_out_shape), AudioRegion::LogB))); - items.push_back (MenuElem (_("Fast"), bind (slot (arv->region, &AudioRegion::set_fade_out_shape), AudioRegion::LogA))); - items.push_back (MenuElem (_("Fastest"), bind (slot (arv->region, &AudioRegion::set_fade_out_shape), AudioRegion::Slow))); + items.push_back (MenuElem (_("Linear"), bind (mem_fun (arv->region, &AudioRegion::set_fade_out_shape), AudioRegion::Linear))); + items.push_back (MenuElem (_("Slowest"), bind (mem_fun (arv->region, &AudioRegion::set_fade_out_shape), AudioRegion::Fast))); + items.push_back (MenuElem (_("Slow"), bind (mem_fun (arv->region, &AudioRegion::set_fade_out_shape), AudioRegion::LogB))); + items.push_back (MenuElem (_("Fast"), bind (mem_fun (arv->region, &AudioRegion::set_fade_out_shape), AudioRegion::LogA))); + items.push_back (MenuElem (_("Fastest"), bind (mem_fun (arv->region, &AudioRegion::set_fade_out_shape), AudioRegion::Slow))); break; default: @@ -2062,16 +1467,18 @@ Editor::popup_track_context_menu (int button, int32_t time, ItemType item_type, if (!with_selection) { if (region_edit_menu_split_item) { if (clicked_regionview && clicked_regionview->region.covers (edit_cursor->current_frame)) { - region_edit_menu_split_item->set_sensitive (true); + ActionManager::set_sensitive (ActionManager::edit_cursor_in_region_sensitive_actions, true); } else { - region_edit_menu_split_item->set_sensitive (false); + ActionManager::set_sensitive (ActionManager::edit_cursor_in_region_sensitive_actions, false); } } if (region_edit_menu_split_multichannel_item) { if (clicked_regionview && clicked_regionview->region.n_channels() > 1) { - region_edit_menu_split_multichannel_item->set_sensitive (true); + // GTK2FIX find the action, change its sensitivity + // region_edit_menu_split_multichannel_item->set_sensitive (true); } else { - region_edit_menu_split_multichannel_item->set_sensitive (false); + // GTK2FIX see above + // region_edit_menu_split_multichannel_item->set_sensitive (false); } } } @@ -2298,11 +1705,11 @@ Editor::add_region_context_items (StreamView* sv, Region* region, Menu_Helpers:: become selected. */ - region_menu->map_event.connect (bind (mem_fun(*this, &Editor::set_selected_regionview_from_map_event), sv, region)); + region_menu->signal_map_event().connect (bind (mem_fun(*this, &Editor::set_selected_regionview_from_map_event), sv, region)); items.push_back (MenuElem (_("Popup region editor"), mem_fun(*this, &Editor::edit_region))); items.push_back (MenuElem (_("Raise to top layer"), mem_fun(*this, &Editor::raise_region_to_top))); - items.push_back (MenuElem (_("Lower to bottom layer"), slot (*this, &Editor::lower_region_to_bottom))); + items.push_back (MenuElem (_("Lower to bottom layer"), mem_fun (*this, &Editor::lower_region_to_bottom))); items.push_back (SeparatorElem()); items.push_back (MenuElem (_("Define sync point"), mem_fun(*this, &Editor::set_region_sync_from_edit_cursor))); items.push_back (MenuElem (_("Remove sync point"), mem_fun(*this, &Editor::remove_region_sync))); @@ -2375,10 +1782,10 @@ Editor::add_region_context_items (StreamView* sv, Region* region, Menu_Helpers:: items.push_back (SeparatorElem()); items.push_back (MenuElem (_("Split"), (mem_fun(*this, &Editor::split_region)))); - region_edit_menu_split_item = items.back(); + region_edit_menu_split_item = &items.back(); items.push_back (MenuElem (_("Make mono regions"), (mem_fun(*this, &Editor::split_multichannel_region)))); - region_edit_menu_split_multichannel_item = items.back(); + region_edit_menu_split_multichannel_item = &items.back(); items.push_back (MenuElem (_("Duplicate"), (bind (mem_fun(*this, &Editor::duplicate_dialog), true)))); items.push_back (MenuElem (_("Fill Track"), (mem_fun(*this, &Editor::region_fill_track)))); @@ -2586,7 +1993,7 @@ Editor::set_snap_to (SnapType st) { snap_type = st; vector txt = internationalize (snap_type_strings); - snap_type_selector.get_entry()->set_text (txt[(int)st]); + snap_type_selector.set_active_text (txt[(int)st]); instant_save (); @@ -2608,7 +2015,7 @@ Editor::set_snap_mode (SnapMode mode) { snap_mode = mode; vector txt = internationalize (snap_mode_strings); - snap_mode_selector.get_entry()->set_text (txt[(int)mode]); + snap_mode_selector.set_active_text (txt[(int)mode]); instant_save (); } @@ -2677,7 +2084,7 @@ Editor::set_state (const XMLNode& node) } set_default_size(width, height); - set_uposition(x, y-yoff); + move (x, y-yoff); if ((prop = node.property ("zoom-focus"))) { set_zoom_focus ((ZoomFocus) atoi (prop->value())); @@ -2715,8 +2122,13 @@ Editor::set_state (const XMLNode& node) if ((prop = node.property ("follow-playhead"))) { bool yn = (prop->value() == "yes"); - _follow_playhead = !yn; - set_follow_playhead (yn); + RefPtr act = ActionManager::get_action (X_("Editor"), X_("ToggleFollowPlayhead")); + if (act) { + RefPtr tact = RefPtr::cast_dynamic(act); + /* do it twice to force the change */ + tact->set_active (!yn); + tact->set_active (yn); + } } if ((prop = node.property ("xfades-visible"))) { @@ -2753,12 +2165,12 @@ Editor::get_state () char buf[32]; if (is_realized()) { - Gdk_Window win = get_window(); + Glib::RefPtr win = get_window(); int x, y, xoff, yoff, width, height; - win.get_root_origin(x, y); - win.get_position(xoff, yoff); - win.get_size(width, height); + win->get_root_origin(x, y); + win->get_position(xoff, yoff); + win->get_size(width, height); XMLNode* geometry = new XMLNode ("geometry"); char buf[32]; @@ -2774,14 +2186,8 @@ Editor::get_state () geometry->add_property("x_off", string(buf)); snprintf(buf, sizeof(buf), "%d", yoff); geometry->add_property("y_off", string(buf)); - snprintf(buf,sizeof(buf), "%d",gtk_paned_get_position (static_cast(&canvas_region_list_pane)->gobj())); - geometry->add_property("canvas_region_list_pane_pos", string(buf)); - snprintf(buf,sizeof(buf), "%d", gtk_paned_get_position (static_cast(&track_list_canvas_pane)->gobj())); - geometry->add_property("track_list_canvas_pane_pos", string(buf)); - snprintf(buf,sizeof(buf), "%d", gtk_paned_get_position (static_cast(®ion_selection_vpane)->gobj())); - geometry->add_property("region_selection_pane_pos", string(buf)); - snprintf(buf,sizeof(buf), "%d", gtk_paned_get_position (static_cast(&route_group_vpane)->gobj())); - geometry->add_property("route_group_pane_pos", string(buf)); + snprintf(buf,sizeof(buf), "%d",gtk_paned_get_position (static_cast(&edit_pane)->gobj())); + geometry->add_property("edit_pane_pos", string(buf)); node->add_child_nocopy (*geometry); } @@ -3042,7 +2448,7 @@ Editor::snap_to (jack_nframes_t& start, int32_t direction, bool for_mark) void Editor::setup_toolbar () { - nstring pixmap_path; + string pixmap_path; vector mouse_mode_buttons; mouse_mode_buttons.push_back (&mouse_move_button); @@ -3069,10 +2475,10 @@ Editor::setup_toolbar () mouse_mode_tearoff = manage (new TearOff (mouse_mode_button_table)); mouse_mode_tearoff->set_name ("MouseModeBase"); - mouse_mode_tearoff->Detach.connect (bind (mem_fun(*this, &Editor::detach_tearoff), static_cast(&toolbar_hbox), - static_cast(&mouse_mode_button_table))); - mouse_mode_tearoff->Attach.connect (bind (mem_fun(*this, &Editor::reattach_tearoff), static_cast (&toolbar_hbox), - static_cast (&mouse_mode_button_table), 1)); + mouse_mode_tearoff->Detach.connect (bind (mem_fun(*this, &Editor::detach_tearoff), static_cast(&toolbar_hbox), + &mouse_mode_tearoff->tearoff_window())); + mouse_mode_tearoff->Attach.connect (bind (mem_fun(*this, &Editor::reattach_tearoff), static_cast (&toolbar_hbox), + &mouse_mode_tearoff->tearoff_window(), 1)); mouse_move_button.set_name ("MouseModeButton"); mouse_select_button.set_name ("MouseModeButton"); @@ -3088,21 +2494,21 @@ Editor::setup_toolbar () ARDOUR_UI::instance()->tooltips().set_tip (mouse_timefx_button, _("stretch/shrink regions")); ARDOUR_UI::instance()->tooltips().set_tip (mouse_audition_button, _("listen to specific regions")); - mouse_move_button.unset_flags (Gtk::CAN_FOCUS); - mouse_select_button.unset_flags (Gtk::CAN_FOCUS); - mouse_gain_button.unset_flags (Gtk::CAN_FOCUS); - mouse_zoom_button.unset_flags (Gtk::CAN_FOCUS); - mouse_timefx_button.unset_flags (Gtk::CAN_FOCUS); - mouse_audition_button.unset_flags (Gtk::CAN_FOCUS); + mouse_move_button.unset_flags (CAN_FOCUS); + mouse_select_button.unset_flags (CAN_FOCUS); + mouse_gain_button.unset_flags (CAN_FOCUS); + mouse_zoom_button.unset_flags (CAN_FOCUS); + mouse_timefx_button.unset_flags (CAN_FOCUS); + mouse_audition_button.unset_flags (CAN_FOCUS); - mouse_select_button.toggled.connect (bind (mem_fun(*this, &Editor::mouse_mode_toggled), Editing::MouseRange)); - mouse_select_button.button_release_event.connect (mem_fun(*this, &Editor::mouse_select_button_release)); + mouse_select_button.signal_toggled().connect (bind (mem_fun(*this, &Editor::mouse_mode_toggled), Editing::MouseRange)); + mouse_select_button.signal_button_release_event().connect (mem_fun(*this, &Editor::mouse_select_button_release)); - mouse_move_button.toggled.connect (bind (mem_fun(*this, &Editor::mouse_mode_toggled), Editing::MouseObject)); - mouse_gain_button.toggled.connect (bind (mem_fun(*this, &Editor::mouse_mode_toggled), Editing::MouseGain)); - mouse_zoom_button.toggled.connect (bind (mem_fun(*this, &Editor::mouse_mode_toggled), Editing::MouseZoom)); - mouse_timefx_button.toggled.connect (bind (mem_fun(*this, &Editor::mouse_mode_toggled), Editing::MouseTimeFX)); - mouse_audition_button.toggled.connect (bind (mem_fun(*this, &Editor::mouse_mode_toggled), Editing::MouseAudition)); + mouse_move_button.signal_toggled().connect (bind (mem_fun(*this, &Editor::mouse_mode_toggled), Editing::MouseObject)); + mouse_gain_button.signal_toggled().connect (bind (mem_fun(*this, &Editor::mouse_mode_toggled), Editing::MouseGain)); + mouse_zoom_button.signal_toggled().connect (bind (mem_fun(*this, &Editor::mouse_mode_toggled), Editing::MouseZoom)); + mouse_timefx_button.signal_toggled().connect (bind (mem_fun(*this, &Editor::mouse_mode_toggled), Editing::MouseTimeFX)); + mouse_audition_button.signal_toggled().connect (bind (mem_fun(*this, &Editor::mouse_mode_toggled), Editing::MouseAudition)); // mouse_move_button.set_active (true); @@ -3121,87 +2527,74 @@ Editor::setup_toolbar () edit_mode_label.set_name ("ToolBarLabel"); edit_mode_selector.set_name ("EditModeSelector"); - edit_mode_selector.get_entry()->set_name ("EditModeSelector"); - edit_mode_selector.get_popwin()->set_name ("EditModeSelector"); edit_mode_box.set_spacing (3); edit_mode_box.set_border_width (3); /* XXX another disgusting hack because of the way combo boxes size themselves */ - Gtkmm2ext::set_size_request_to_display_given_text (*edit_mode_selector.get_entry(), "EdgtMode", 2, 10); - edit_mode_selector.set_popdown_strings (internationalize (edit_mode_strings)); - edit_mode_selector.set_value_in_list (true, false); - + const guint32 FUDGE = 20; // Combo's are stupid - they steal space from the entry for the button + Gtkmm2ext::set_size_request_to_display_given_text (edit_mode_selector, "EdgtMode", 2+FUDGE, 10); + set_popdown_strings (edit_mode_selector, internationalize (edit_mode_strings)); edit_mode_box.pack_start (edit_mode_label, false, false); edit_mode_box.pack_start (edit_mode_selector, false, false); - edit_mode_selector.get_popwin()->unmap_event.connect (mem_fun(*this, &Editor::edit_mode_selection_done)); + edit_mode_selector.signal_changed().connect (mem_fun(*this, &Editor::edit_mode_selection_done)); /* Snap Type */ snap_type_label.set_name ("ToolBarLabel"); snap_type_selector.set_name ("SnapTypeSelector"); - snap_type_selector.get_entry()->set_name ("SnapTypeSelector"); - snap_type_selector.get_popwin()->set_name ("SnapTypeSelector"); snap_type_box.set_spacing (3); snap_type_box.set_border_width (3); /* XXX another disgusting hack because of the way combo boxes size themselves */ - const guint32 FUDGE = 10; // Combo's are stupid - they steal space from the entry for the button - Gtkmm2ext::set_size_request_to_display_given_text (*snap_type_selector.get_entry(), "Region bounds", 2+FUDGE, 10); - snap_type_selector.set_popdown_strings (internationalize (snap_type_strings)); - snap_type_selector.set_value_in_list (true, false); + Gtkmm2ext::set_size_request_to_display_given_text (snap_type_selector, "SMPTE Seconds", 2+FUDGE, 10); + set_popdown_strings (snap_type_selector, internationalize (snap_type_strings)); snap_type_box.pack_start (snap_type_label, false, false); snap_type_box.pack_start (snap_type_selector, false, false); - snap_type_selector.get_popwin()->unmap_event.connect (mem_fun(*this, &Editor::snap_type_selection_done)); + snap_type_selector.signal_changed().connect (mem_fun(*this, &Editor::snap_type_selection_done)); /* Snap mode, not snap type */ snap_mode_label.set_name ("ToolBarLabel"); snap_mode_selector.set_name ("SnapModeSelector"); - snap_mode_selector.get_entry()->set_name ("SnapModeSelector"); - snap_mode_selector.get_popwin()->set_name ("SnapModeSelector"); snap_mode_box.set_spacing (3); snap_mode_box.set_border_width (3); - Gtkmm2ext::set_size_request_to_display_given_text (*snap_mode_selector.get_entry(), "SngpMode", 2, 10); - snap_mode_selector.set_popdown_strings (internationalize (snap_mode_strings)); - snap_mode_selector.set_value_in_list (true, false); + Gtkmm2ext::set_size_request_to_display_given_text (snap_mode_selector, "SngpMode", 2+FUDGE, 10); + set_popdown_strings (snap_mode_selector, internationalize (snap_mode_strings)); snap_mode_box.pack_start (snap_mode_label, false, false); snap_mode_box.pack_start (snap_mode_selector, false, false); - snap_mode_selector.get_popwin()->unmap_event.connect (mem_fun(*this, &Editor::snap_mode_selection_done)); + snap_mode_selector.signal_changed().connect (mem_fun(*this, &Editor::snap_mode_selection_done)); /* Zoom focus mode */ zoom_focus_label.set_name ("ToolBarLabel"); zoom_focus_selector.set_name ("ZoomFocusSelector"); - zoom_focus_selector.get_entry()->set_name ("ZoomFocusSelector"); - zoom_focus_selector.get_popwin()->set_name ("ZoomFocusSelector"); zoom_focus_box.set_spacing (3); zoom_focus_box.set_border_width (3); /* XXX another disgusting hack because of the way combo boxes size themselves */ - Gtkmm2ext::set_size_request_to_display_given_text (*zoom_focus_selector.get_entry(), "Edgt Cursor", 2, 10); - zoom_focus_selector.set_popdown_strings (internationalize (zoom_focus_strings)); - zoom_focus_selector.set_value_in_list (true, false); + Gtkmm2ext::set_size_request_to_display_given_text (zoom_focus_selector, "Edgt Cursor", 2+FUDGE, 10); + set_popdown_strings (zoom_focus_selector, internationalize (zoom_focus_strings)); zoom_focus_box.pack_start (zoom_focus_label, false, false); zoom_focus_box.pack_start (zoom_focus_selector, false, false); - zoom_focus_selector.get_popwin()->unmap_event.connect (mem_fun(*this, &Editor::zoom_focus_selection_done)); + zoom_focus_selector.signal_changed().connect (mem_fun(*this, &Editor::zoom_focus_selection_done)); /* selection/cursor clocks */ @@ -3212,23 +2605,35 @@ Editor::setup_toolbar () selection_start_clock_label.set_text (_("Start:")); selection_end_clock_label.set_text (_("End:")); - edit_cursor_clock_label.set_text (_("Edit:")); + edit_cursor_clock_label.set_text (_("Edit")); + + /* the zoom in/out buttons are generally taller than the clocks, so + put all the toolbar clocks into a size group with one of the + buttons to make them all equal height. + + this also applies to the various toolbar combos + */ - toolbar_selection_clock_table.set_border_width (5); - toolbar_selection_clock_table.set_col_spacings (2); - toolbar_selection_clock_table.set_homogeneous (false); + RefPtr toolbar_clock_size_group = SizeGroup::create (SIZE_GROUP_VERTICAL); + toolbar_clock_size_group->add_widget (zoom_out_button); + toolbar_clock_size_group->add_widget (edit_cursor_clock); + toolbar_clock_size_group->add_widget (zoom_range_clock); + toolbar_clock_size_group->add_widget (nudge_clock); + toolbar_clock_size_group->add_widget (edit_mode_selector); + toolbar_clock_size_group->add_widget (snap_type_selector); + toolbar_clock_size_group->add_widget (snap_mode_selector); + toolbar_clock_size_group->add_widget (zoom_focus_selector); -// toolbar_selection_clock_table.attach (selection_start_clock_label, 0, 1, 0, 1, 0, 0, 0, 0); -// toolbar_selection_clock_table.attach (selection_end_clock_label, 1, 2, 0, 1, 0, 0, 0, 0); - toolbar_selection_clock_table.attach (edit_cursor_clock_label, 2, 3, 0, 1, 0, 0, 0, 0); + HBox* edit_clock_hbox = manage (new HBox()); + VBox* edit_clock_vbox = manage (new VBox()); -// toolbar_selection_clock_table.attach (selection_start_clock, 0, 1, 1, 2, 0, 0); -// toolbar_selection_clock_table.attach (selection_end_clock, 1, 2, 1, 2, 0, 0); - toolbar_selection_clock_table.attach (edit_cursor_clock, 2, 3, 1, 2, 0, 0); + edit_clock_hbox->pack_start (edit_cursor_clock, false, false); + edit_clock_vbox->set_spacing (3); + edit_clock_vbox->set_border_width (3); + edit_clock_vbox->pack_start (edit_cursor_clock_label, false, false); + edit_clock_vbox->pack_start (*edit_clock_hbox, false, false); -// toolbar_clock_vbox.set_spacing (2); -// toolbar_clock_vbox.set_border_width (10); /* the editor/mixer button will be enabled at session connect */ editor_mixer_button.set_active(false); @@ -3237,7 +2642,7 @@ Editor::setup_toolbar () HBox* hbox = new HBox; hbox->pack_start (editor_mixer_button, false, false); - hbox->pack_start (toolbar_selection_clock_table, false, false); + hbox->pack_start (*edit_clock_vbox, false, false); hbox->pack_start (zoom_indicator_vbox, false, false); hbox->pack_start (zoom_focus_box, false, false); hbox->pack_start (snap_type_box, false, false); @@ -3270,10 +2675,11 @@ Editor::setup_toolbar () tools_tearoff = new TearOff (*hbox); tools_tearoff->set_name ("MouseModeBase"); - tools_tearoff->Detach.connect (bind (mem_fun(*this, &Editor::detach_tearoff), static_cast(&toolbar_hbox), - static_cast(hbox))); - tools_tearoff->Attach.connect (bind (mem_fun(*this, &Editor::reattach_tearoff), static_cast (&toolbar_hbox), - static_cast (hbox), 0)); + tools_tearoff->Detach.connect (bind (mem_fun(*this, &Editor::detach_tearoff), static_cast(&toolbar_hbox), + &tools_tearoff->tearoff_window())); + tools_tearoff->Attach.connect (bind (mem_fun(*this, &Editor::reattach_tearoff), static_cast (&toolbar_hbox), + &tools_tearoff->tearoff_window(), 0)); + toolbar_hbox.set_spacing (8); toolbar_hbox.set_border_width (2); @@ -3284,7 +2690,7 @@ Editor::setup_toolbar () toolbar_base.set_name ("ToolBarBase"); toolbar_base.add (toolbar_hbox); - toolbar_frame.set_shadow_type (Gtk::SHADOW_OUT); + toolbar_frame.set_shadow_type (SHADOW_OUT); toolbar_frame.set_name ("BaseFrame"); toolbar_frame.add (toolbar_base); } @@ -3386,130 +2792,80 @@ Editor::stop_canvas_autoscroll () int Editor::convert_drop_to_paths (vector& paths, - GdkDragContext *context, + const RefPtr& context, gint x, gint y, - GtkSelectionData *data, + const SelectionData& data, guint info, guint time) { - string spath; - char *path; - int state; - gchar *tname = gdk_atom_name (data->type); - - if (session == 0 || strcmp (tname, "text/plain") != 0) { + if (session == 0) { return -1; } - /* Parse the "uri-list" format that Nautilus provides, - where each pathname is delimited by \r\n - */ + vector uris = data.get_uris(); - path = (char *) data->data; - state = 0; + if (uris.empty()) { + + /* This is seriously fucked up. Nautilus doesn't say that its URI lists + are actually URI lists. So do it by hand. + */ - for (int n = 0; n < data->length; ++n) { + if (data.get_target() != "text/plain") { + return -1; + } + + /* Parse the "uri-list" format that Nautilus provides, + where each pathname is delimited by \r\n + */ + + const char* p = data.get_text().c_str(); + const char* q; - switch (state) { - case 0: - if (path[n] == '\r') { - state = 1; - } else { - spath += path[n]; - } - break; - case 1: - if (path[n] == '\n') { - paths.push_back (spath); - spath = ""; - state = 0; - } else { - warning << _("incorrectly formatted URI list, ignored") - << endmsg; - return -1; + while (p) + { + if (*p != '#') + { + while (g_ascii_isspace (*p)) + p++; + + q = p; + while (*q && (*q != '\n') && (*q != '\r')) + q++; + + if (q > p) + { + q--; + while (q > p && g_ascii_isspace (*q)) + q--; + + if (q > p) + { + uris.push_back (ustring (p, q - p + 1)); + } + } } - break; + p = strchr (p, '\n'); + if (p) + p++; } - } - - /* nautilus and presumably some other file managers prefix even text/plain with file:// */ - - for (vector::iterator p = paths.begin(); p != paths.end(); ++p) { - - // cerr << "dropped text was " << *p << endl; - - url_decode (*p); - - // cerr << "decoded was " << *p << endl; - if ((*p).substr (0,7) == "file://") { - (*p) = (*p).substr (7); + if (uris.empty()) { + return -1; } } - return 0; -} - -void -Editor::track_canvas_drag_data_received (GdkDragContext *context, - gint x, - gint y, - GtkSelectionData *data, - guint info, - guint time) -{ - TimeAxisView* tvp; - AudioTimeAxisView* tv; - double cy; - vector paths; - string spath; - GdkEvent ev; - jack_nframes_t frame; - - if (convert_drop_to_paths (paths, context, x, y, data, info, time)) { - goto out; - } - - /* D-n-D coordinates are window-relative, so convert to "world" coordinates - */ - - double wx; - double wy; - - gnome_canvas_window_to_world (GNOME_CANVAS(track_gnome_canvas), (double) x, (double) y, &wx, &wy); - - ev.type = GDK_BUTTON_RELEASE; - ev.button.x = wx; - ev.button.y = wy; - - frame = event_frame (&ev, 0, &cy); - - snap_to (frame); - - if ((tvp = trackview_by_y_position (cy)) == 0) { - - /* drop onto canvas background: create a new track */ - - insert_paths_as_new_tracks (paths, false); - - - } else if ((tv = dynamic_cast(tvp)) != 0) { - - /* check that its an audio track, not a bus */ - - if (tv->get_diskstream()) { - - for (vector::iterator p = paths.begin(); p != paths.end(); ++p) { - insert_sndfile_into (*p, true, tv, frame); - } + for (vector::iterator i = uris.begin(); i != uris.end(); ++i) { + if ((*i).substr (0,7) == "file://") { + string p = *i; + url_decode (p); + cerr << "adding " << p << endl; + paths.push_back (p.substr (7)); } - } - out: - gtk_drag_finish (context, TRUE, FALSE, time); + return 0; } void @@ -3546,7 +2902,7 @@ Editor::get_memento () const State *state = new State; store_state (*state); - return bind (slot (*(const_cast(this)), &Editor::restore_state), state); + return bind (mem_fun (*(const_cast(this)), &Editor::restore_state), state); } void @@ -3587,19 +2943,6 @@ Editor::commit_reversible_command () } } -void -Editor::flush_track_canvas () -{ - /* I don't think this is necessary, and only causes more problems. - I'm commenting it out - and if the imageframe folks don't have any issues, we can take - out this method entirely - */ - - //gnome_canvas_update_now (GNOME_CANVAS(track_gnome_canvas)); - //gtk_main_iteration (); -} - void Editor::set_selected_track_from_click (bool add, bool with_undo, bool no_remove) { @@ -3810,7 +3153,7 @@ Editor::set_selected_regionview_from_region_list (Region& r, bool add) commit_reversible_command () ; } -gint +bool Editor::set_selected_regionview_from_map_event (GdkEventAny* ev, StreamView* sv, Region* r) { AudioRegionView* rv; @@ -3869,11 +3212,11 @@ void Editor::set_edit_menu (Menu& menu) { edit_menu = &menu; - edit_menu->map_.connect (mem_fun(*this, &Editor::edit_menu_map_handler)); + edit_menu->signal_map_event().connect (mem_fun(*this, &Editor::edit_menu_map_handler)); } -void -Editor::edit_menu_map_handler () +bool +Editor::edit_menu_map_handler (GdkEventAny* ev) { using namespace Menu_Helpers; MenuList& edit_items = edit_menu->items(); @@ -3884,46 +3227,46 @@ Editor::edit_menu_map_handler () edit_items.clear (); if (session == 0) { - return; + return false; } if (session->undo_depth() == 0) { label = _("Undo"); } else { - label = compose(_("Undo (%1)"), session->next_undo()); + label = string_compose(_("Undo (%1)"), session->next_undo()); } edit_items.push_back (MenuElem (label, bind (mem_fun(*this, &Editor::undo), 1U))); if (session->undo_depth() == 0) { - edit_items.back()->set_sensitive (false); + edit_items.back().set_sensitive (false); } if (session->redo_depth() == 0) { label = _("Redo"); } else { - label = compose(_("Redo (%1)"), session->next_redo()); + label = string_compose(_("Redo (%1)"), session->next_redo()); } edit_items.push_back (MenuElem (label, bind (mem_fun(*this, &Editor::redo), 1U))); if (session->redo_depth() == 0) { - edit_items.back()->set_sensitive (false); + edit_items.back().set_sensitive (false); } vector mitems; edit_items.push_back (SeparatorElem()); edit_items.push_back (MenuElem (_("Cut"), mem_fun(*this, &Editor::cut))); - mitems.push_back (edit_items.back()); + mitems.push_back (&edit_items.back()); edit_items.push_back (MenuElem (_("Copy"), mem_fun(*this, &Editor::copy))); - mitems.push_back (edit_items.back()); + mitems.push_back (&edit_items.back()); edit_items.push_back (MenuElem (_("Paste"), bind (mem_fun(*this, &Editor::paste), 1.0f))); - mitems.push_back (edit_items.back()); + mitems.push_back (&edit_items.back()); edit_items.push_back (SeparatorElem()); edit_items.push_back (MenuElem (_("Align"), bind (mem_fun(*this, &Editor::align), ARDOUR::SyncPoint))); - mitems.push_back (edit_items.back()); + mitems.push_back (&edit_items.back()); edit_items.push_back (MenuElem (_("Align Relative"), bind (mem_fun(*this, &Editor::align_relative), ARDOUR::SyncPoint))); - mitems.push_back (edit_items.back()); + mitems.push_back (&edit_items.back()); edit_items.push_back (SeparatorElem()); if (selection->empty()) { @@ -3952,8 +3295,10 @@ Editor::edit_menu_map_handler () edit_items.push_back (MenuElem (_("Remove last capture"), mem_fun(*this, &Editor::remove_last_capture))); if (!session->have_captured()) { - edit_items.back()->set_sensitive (false); + edit_items.back().set_sensitive (false); } + + return false; } void @@ -3972,51 +3317,27 @@ Editor::duplicate_dialog (bool dup_region) ArdourDialog win ("duplicate dialog"); Entry entry; Label label (_("Duplicate how many times?")); - HBox hbox; - HBox button_box; - Button ok_button (_("OK")); - Button cancel_button (_("Cancel")); - VBox vbox; - - button_box.set_spacing (7); - set_size_request_to_display_given_text (ok_button, _("Cancel"), 20, 15); // this is cancel on purpose - set_size_request_to_display_given_text (cancel_button, _("Cancel"), 20, 15); - button_box.pack_end (ok_button, false, false); - button_box.pack_end (cancel_button, false, false); - - hbox.set_spacing (5); - hbox.pack_start (label); - hbox.pack_start (entry, true, true); - - vbox.set_spacing (5); - vbox.set_border_width (5); - vbox.pack_start (hbox); - vbox.pack_start (button_box); - win.add (vbox); - win.set_position (Gtk::WIN_POS_MOUSE); - win.show_all (); + win.get_vbox()->pack_start (label); + win.add_action_widget (entry, RESPONSE_ACCEPT); + win.add_button (Stock::OK, RESPONSE_ACCEPT); + win.add_button (Stock::CANCEL, RESPONSE_CANCEL); - ok_button.signal_clicked().connect (bind (slot (win, &ArdourDialog::stop), 0)); - entry.activate.connect (bind (slot (win, &ArdourDialog::stop), 0)); - cancel_button.signal_clicked().connect (bind (slot (win, &ArdourDialog::stop), 1)); + win.set_position (WIN_POS_MOUSE); - entry.signal_focus_in_event().connect (slot (ARDOUR_UI::generic_focus_in_event)); - entry.signal_focus_out_event().connect (slot (ARDOUR_UI::generic_focus_out_event)); - entry.set_text ("1"); set_size_request_to_display_given_text (entry, X_("12345678"), 20, 15); entry.select_region (0, entry.get_text_length()); - - win.set_position (Gtk::WIN_POS_MOUSE); - win.realize (); - win.get_window().set_decorations (GdkWMDecoration (GDK_DECOR_BORDER|GDK_DECOR_RESIZEH)); - entry.grab_focus (); - win.run (); + // GTK2FIX + // win.get_window()->set_decorations (Gdk::WMDecoration (Gdk::DECOR_BORDER|Gdk::DECOR_RESIZEH)); - if (win.run_status() != 0) { + + switch (win.run ()) { + case RESPONSE_ACCEPT: + break; + default: return; } @@ -4037,41 +3358,43 @@ Editor::duplicate_dialog (bool dup_region) void Editor::show_verbose_canvas_cursor () { - gnome_canvas_item_raise_to_top (verbose_canvas_cursor); - gnome_canvas_item_show (verbose_canvas_cursor); + verbose_canvas_cursor->raise_to_top(); + verbose_canvas_cursor->show(); verbose_cursor_visible = true; } void Editor::hide_verbose_canvas_cursor () { - gnome_canvas_item_hide (verbose_canvas_cursor); + verbose_canvas_cursor->hide(); verbose_cursor_visible = false; } void -Editor::set_verbose_canvas_cursor (string txt, double x, double y) +Editor::set_verbose_canvas_cursor (const string & txt, double x, double y) { /* XXX get origin of canvas relative to root window, add x and y and check compared to gdk_screen_{width,height} */ - gnome_canvas_item_set (verbose_canvas_cursor, "text", txt.c_str(), "x", x, "y", y, NULL); + verbose_canvas_cursor->property_text() = txt.c_str(); + verbose_canvas_cursor->property_x() = x; + verbose_canvas_cursor->property_y() = y; } void -Editor::set_verbose_canvas_cursor_text (string txt) +Editor::set_verbose_canvas_cursor_text (const string & txt) { - gnome_canvas_item_set (verbose_canvas_cursor, "text", txt.c_str(), NULL); + verbose_canvas_cursor->property_text() = txt.c_str(); } -gint -Editor::edit_mode_selection_done (GdkEventAny *ev) +void +Editor::edit_mode_selection_done () { if (session == 0) { - return FALSE; + return; } - string choice = edit_mode_selector.get_entry()->get_text(); + string choice = edit_mode_selector.get_active_text(); EditMode mode = Slide; if (choice == _("Splice")) { @@ -4081,18 +3404,16 @@ Editor::edit_mode_selection_done (GdkEventAny *ev) } session->set_edit_mode (mode); - - return FALSE; } -gint -Editor::snap_type_selection_done (GdkEventAny *ev) +void +Editor::snap_type_selection_done () { if (session == 0) { - return FALSE; + return; } - string choice = snap_type_selector.get_entry()->get_text(); + string choice = snap_type_selector.get_active_text(); SnapType snaptype = SnapToFrame; if (choice == _("Beats/3")) { @@ -4138,16 +3459,16 @@ Editor::snap_type_selection_done (GdkEventAny *ev) } set_snap_to (snaptype); - - return FALSE; } -gint -Editor::snap_mode_selection_done (GdkEventAny *ev) +void +Editor::snap_mode_selection_done () { - if(session == 0) return FALSE; + if(session == 0) { + return; + } - string choice = snap_mode_selector.get_entry()->get_text(); + string choice = snap_mode_selector.get_active_text(); SnapMode mode = SnapNormal; if (choice == _("Normal")) { @@ -4157,18 +3478,16 @@ Editor::snap_mode_selection_done (GdkEventAny *ev) } set_snap_mode (mode); - - return FALSE; } -gint -Editor::zoom_focus_selection_done (GdkEventAny *ev) +void +Editor::zoom_focus_selection_done () { if (session == 0) { - return FALSE; + return; } - string choice = zoom_focus_selector.get_entry()->get_text(); + string choice = zoom_focus_selector.get_active_text(); ZoomFocus focus_type = ZoomFocusLeft; if (choice == _("Left")) { @@ -4184,8 +3503,6 @@ Editor::zoom_focus_selection_done (GdkEventAny *ev) } set_zoom_focus (focus_type); - - return FALSE; } gint @@ -4257,29 +3574,6 @@ Editor::point_selection_changed () } } -void -Editor::run_sub_event_loop () -{ - Keyboard::the_keyboard().allow_focus (true); - sub_event_loop_status = 0; - Main::run (); -} - -void -Editor::finish_sub_event_loop (int status) -{ - Main::quit (); - Keyboard::the_keyboard().allow_focus (false); - sub_event_loop_status = status; -} - -gint -Editor::finish_sub_event_loop_on_delete (GdkEventAny *ignored, int32_t status) -{ - finish_sub_event_loop (status); - return TRUE; -} - gint Editor::mouse_select_button_release (GdkEventButton* ev) { @@ -4336,7 +3630,7 @@ Editor::set_zoom_focus (ZoomFocus f) if (zoom_focus != f) { zoom_focus = f; vector txt = internationalize (zoom_focus_strings); - zoom_focus_selector.get_entry()->set_text (txt[(int)f]); + zoom_focus_selector.set_active_text (txt[(int)f]); ZoomFocusChanged (); /* EMIT_SIGNAL */ instant_save (); @@ -4350,7 +3644,7 @@ Editor::ensure_float (Window& win) } void -Editor::pane_allocation_handler (GtkAllocation *alloc, Gtk::Paned* which) +Editor::pane_allocation_handler (Allocation &alloc, Paned* which) { /* recover or initialize pane positions. do this here rather than earlier because we don't want the positions to change the child allocations, which they seem to do. @@ -4361,7 +3655,7 @@ Editor::pane_allocation_handler (GtkAllocation *alloc, Gtk::Paned* which) char buf[32]; XMLNode* node = ARDOUR_UI::instance()->editor_settings(); int width, height; - static int32_t done[4] = { 0, 0, 0, 0 }; + static int32_t done; XMLNode* geometry; if ((geometry = find_named_node (*node, "geometry")) == 0) { @@ -4372,89 +3666,37 @@ Editor::pane_allocation_handler (GtkAllocation *alloc, Gtk::Paned* which) height = atoi(geometry->property("y_size")->value()); } - if (which == static_cast (&track_list_canvas_pane)) { + if (which == static_cast (&edit_pane)) { - if (done[0]) { + if (done) { return; } - if (!geometry || (prop = geometry->property("track_list_canvas_pane_pos")) == 0) { - pos = 75; + if (!geometry || (prop = geometry->property ("edit_pane_pos")) == 0) { + /* initial allocation is 90% to canvas, 10% to notebook */ + pos = (int) floor (alloc.get_width() * 0.90f); snprintf (buf, sizeof(buf), "%d", pos); } else { pos = atoi (prop->value()); } - - if ((done[0] = GTK_WIDGET(track_list_canvas_pane.gobj())->allocation.width > pos)) { - track_list_canvas_pane.set_position (pos); - } - - } else if (which == static_cast (&canvas_region_list_pane)) { - - if (done[1]) { - return; - } - - if (!geometry || (prop = geometry->property("canvas_region_list_pane_pos")) == 0) { - pos = width - (95 * 2); - snprintf (buf, sizeof(buf), "%d", pos); - } else { - pos = atoi (prop->value()); - } - - if ((done[1] = GTK_WIDGET(canvas_region_list_pane.gobj())->allocation.width > pos)) { - canvas_region_list_pane.set_position (pos); - } - - } else if (which == static_cast (&route_group_vpane)) { - - if (done[2]) { - return; - } - - if (!geometry || (prop = geometry->property("route_group_pane_pos")) == 0) { - pos = width - (95 * 2); - snprintf (buf, sizeof(buf), "%d", pos); - } else { - pos = atoi (prop->value()); - } - - if ((done[2] = GTK_WIDGET(route_group_vpane.gobj())->allocation.height > pos)) { - route_group_vpane.set_position (pos); - } - - } else if (which == static_cast (®ion_selection_vpane)) { - - if (done[3]) { - return; - } - - if (!geometry || (prop = geometry->property("region_selection_pane_pos")) == 0) { - pos = width - (95 * 2); - snprintf (buf, sizeof(buf), "%d", pos); - } else { - pos = atoi (prop->value()); - } - - if ((done[3] = GTK_WIDGET(region_selection_vpane.gobj())->allocation.height > pos)) { - region_selection_vpane.set_position (pos); + + if ((done = GTK_WIDGET(edit_pane.gobj())->allocation.width > pos)) { + edit_pane.set_position (pos); } } } void -Editor::detach_tearoff (Gtk::Box* b, Gtk::Widget* w) +Editor::detach_tearoff (Box* b, Window* w) { if (tools_tearoff->torn_off() && mouse_mode_tearoff->torn_off()) { top_hbox.remove (toolbar_frame); } - - ensure_float (*w->get_toplevel()); } void -Editor::reattach_tearoff (Gtk::Box* b, Gtk::Widget* w, int32_t n) +Editor::reattach_tearoff (Box* b, Window* w, int32_t n) { if (toolbar_frame.get_parent() == 0) { top_hbox.pack_end (toolbar_frame); @@ -4475,6 +3717,16 @@ Editor::set_show_measures (bool yn) } } +void +Editor::toggle_follow_playhead () +{ + RefPtr act = ActionManager::get_action (X_("Editor"), X_("ToggleFollowPlayhead")); + if (act) { + RefPtr tact = RefPtr::cast_dynamic(act); + set_follow_playhead (tact->get_active()); + } +} + void Editor::set_follow_playhead (bool yn) { @@ -4507,16 +3759,18 @@ Editor::edit_xfade (Crossfade* xfade) ensure_float (cew); - cew.ok_button.signal_clicked().connect (bind (slot (cew, &ArdourDialog::stop), 1)); - cew.cancel_button.signal_clicked().connect (bind (slot (cew, &ArdourDialog::stop), 0)); - cew.delete_event.connect (slot (cew, &ArdourDialog::wm_doi_event_stop)); + // GTK2FIX + // cew.signal_delete_event().connect (mem_fun (cew, &ArdourDialog::wm_doi_event_stop)); - cew.run (); - - if (cew.run_status() == 1) { - cew.apply (); - xfade->StateChanged (Change (~0)); + switch (cew.run ()) { + case RESPONSE_ACCEPT: + break; + default: + return; } + + cew.apply (); + xfade->StateChanged (Change (~0)); } PlaylistSelector& @@ -4540,64 +3794,41 @@ void Editor::end_location_changed (Location* location) { ENSURE_GUI_THREAD (bind (mem_fun(*this, &Editor::end_location_changed), location)); - track_canvas_scroller.get_hadjustment()->set_upper (location->end() / frames_per_unit); + horizontal_adjustment.set_upper (location->end() / frames_per_unit); } int Editor::playlist_deletion_dialog (Playlist* pl) { ArdourDialog dialog ("playlist deletion dialog"); - Label label (compose (_("Playlist %1 is currently unused.\n" + Label label (string_compose (_("Playlist %1 is currently unused.\n" "If left alone, no audio files used by it will be cleaned.\n" "If deleted, audio files used by it alone by will cleaned."), pl->name())); - HBox button_box; - Button del_button (_("Delete playlist")); - Button keep_button (_("Keep playlist")); - Button abort_button (_("Cancel cleanup")); - VBox vbox; - - button_box.set_spacing (7); - button_box.set_homogeneous (true); - button_box.pack_end (del_button, false, false); - button_box.pack_end (keep_button, false, false); - button_box.pack_end (abort_button, false, false); - - vbox.set_spacing (5); - vbox.set_border_width (5); - vbox.pack_start (label); - vbox.pack_start (button_box); - - dialog.add (vbox); - dialog.set_position (GTK_WIN_POS_CENTER); - dialog.show_all (); - del_button.signal_clicked().connect (bind (slot (dialog, &ArdourDialog::stop), 0)); - keep_button.signal_clicked().connect (bind (slot (dialog, &ArdourDialog::stop), 1)); - abort_button.signal_clicked().connect (bind (slot (dialog, &ArdourDialog::stop), 2)); + dialog.set_position (WIN_POS_CENTER); + dialog.get_vbox()->pack_start (label); - dialog.realize (); - dialog.get_window().set_decorations (GdkWMDecoration (GDK_DECOR_BORDER|GDK_DECOR_RESIZEH)); + dialog.add_button (_("Delete playlist"), RESPONSE_ACCEPT); + dialog.add_button (_("Keep playlist"), RESPONSE_CANCEL); + dialog.add_button (_("Cancel"), RESPONSE_CANCEL); - dialog.run (); - - switch (dialog.run_status()) { - case 1: - /* keep the playlist */ - return 1; - break; - case 0: + switch (dialog.run ()) { + case RESPONSE_ACCEPT: /* delete the playlist */ return 0; break; - case 2: - /* abort cleanup */ - return -1; - break; - default: + + case RESPONSE_REJECT: /* keep the playlist */ return 1; + break; + + default: + break; } + + return -1; } bool @@ -4653,3 +3884,88 @@ Editor::transport_punch_location() return 0; } } + +bool +Editor::control_layout_scroll (GdkEventScroll* ev) +{ + switch (ev->direction) { + case GDK_SCROLL_UP: + scroll_tracks_up_line (); + return true; + break; + + case GDK_SCROLL_DOWN: + scroll_tracks_down_line (); + return true; + + default: + /* no left/right handling yet */ + break; + } + + return false; +} + +void +Editor::snapshot_display_selection_changed () +{ + if (snapshot_display.get_selection()->count_selected_rows() > 0) { + + TreeModel::iterator i = snapshot_display.get_selection()->get_selected(); + + cerr << "snapshot selected\n"; + + Glib::ustring snap_name = (*i)[snapshot_display_columns.real_name]; + + cerr << "name is " << snap_name << endl; + + if (snap_name.length() == 0) { + return; + } + + if (session->snap_name() == snap_name) { + return; + } + + ARDOUR_UI::instance()->load_session(session->path(), string (snap_name)); + } +} + +bool +Editor::snapshot_display_button_press (GdkEventButton* ev) +{ + return false; +} + +void +Editor::redisplay_snapshots () +{ + if (session == 0) { + return; + } + + vector* states; + + if ((states = session->possible_states()) == 0) { + return; + } + + snapshot_display_model->clear (); + + for (vector::iterator i = states->begin(); i != states->end(); ++i) { + string statename = *(*i); + TreeModel::Row row = *(snapshot_display_model->append()); + row[snapshot_display_columns.visible_name] = statename; + row[snapshot_display_columns.real_name] = statename; + } + + delete states; +} + +void +Editor::session_state_saved (string snap_name) +{ + ENSURE_GUI_THREAD (bind (mem_fun(*this, &Editor::session_state_saved), snap_name)); + redisplay_snapshots (); +} +