smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-06 23:05:04 +01:00
Code Issues Projects Releases Wiki Activity

More compliation fixes. add_with_viewport() -> add(). track_gnome_canvas -> track_canvas. etc.

Browse source 
git-svn-id: svn://localhost/trunk/ardour2@66 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Taybin Rutkin 2005-10-22 17:33:14 +00:00
parent 50f41b7bd3
commit e0946701e1
11 changed files with 29 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

2
gtk2_ardour/SConscript
View file

@ -68,7 +68,7 @@ automation_pan_line.cc
automation_time_axis.cc automation_time_axis.cc
axis_view.cc axis_view.cc
canvas-imageframe.c canvas-imageframe.c
imagegrame.cc imageframe.cc
canvas-simpleline.c canvas-simpleline.c
simpleline.cc simpleline.cc
canvas-simplerect.c canvas-simplerect.c

12
gtk2_ardour/connection_editor.cc
View file

@ -134,17 +134,15 @@ ConnectionEditor::ConnectionEditor ()
right_vbox.set_border_width (5); right_vbox.set_border_width (5);
right_vbox.pack_start (port_and_selector_box); right_vbox.pack_start (port_and_selector_box);
input_connection_display.set_shadow_type (Gtk::SHADOW_IN); input_connection_display.get_selection()->set_mode(Gtk::SELECTION_SINGLE);
input_connection_display.set_selection_mode (GTK_SELECTION_SINGLE);
input_connection_display.set_size_request (80, -1); input_connection_display.set_size_request (80, -1);
input_connection_display.set_name ("ConnectionEditorConnectionList"); input_connection_display.set_name ("ConnectionEditorConnectionList");
input_connection_display.signal_selection_changed().connect (bind (mem_fun(*this, &ConnectionEditor::connection_selection_changed), input_connection_display)); input_connection_display.get_selection()->signal_changed().connect (bind (mem_fun(*this, &ConnectionEditor::connection_selection_changed), input_connection_display));
output_connection_display.set_shadow_type (Gtk::SHADOW_IN); output_connection_display.get_selection()->set_mode(Gtk::SELECTION_SINGLE);
output_connection_display.set_selection_mode (GTK_SELECTION_SINGLE);
output_connection_display.set_size_request (80, -1); output_connection_display.set_size_request (80, -1);
output_connection_display.set_name ("ConnectionEditorConnectionList"); output_connection_display.set_name ("ConnectionEditorConnectionList");
output_connection_display.signal_selection_changed().connect (bind (mem_fun(*this, &ConnectionEditor::connection_selected), output_connection_display)); output_connection_display.get_selection()->signal_changed().connect (bind (mem_fun(*this, &ConnectionEditor::connection_selection_changed), output_connection_display));
input_scroller.set_policy (Gtk::POLICY_NEVER, Gtk::POLICY_AUTOMATIC); input_scroller.set_policy (Gtk::POLICY_NEVER, Gtk::POLICY_AUTOMATIC);
output_scroller.set_policy (Gtk::POLICY_NEVER, Gtk::POLICY_AUTOMATIC); output_scroller.set_policy (Gtk::POLICY_NEVER, Gtk::POLICY_AUTOMATIC);
@ -451,7 +449,7 @@ ConnectionEditor::display_ports ()
Gtk::CList *client_port_display = manage (new Gtk::CList (1)); Gtk::CList *client_port_display = manage (new Gtk::CList (1));
ScrolledWindow *scroller = manage (new ScrolledWindow); ScrolledWindow *scroller = manage (new ScrolledWindow);
scroller->add_with_viewport (*client_port_display); scroller->add (*client_port_display);
scroller->set_policy (Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC); scroller->set_policy (Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
client_box->pack_start (*scroller); client_box->pack_start (*scroller);

2
gtk2_ardour/connection_editor.h
View file

@ -153,7 +153,7 @@ class ConnectionEditor : public ArdourDialog {
void port_column_click (gint col, Gtk::TreeView* ); void port_column_click (gint col, Gtk::TreeView* );
gint port_button_event (GdkEventButton *, Gtk::TreeView*); gint port_button_event (GdkEventButton *, Gtk::TreeView*);
gint connection_click (GdkEventButton *ev, Gtk::TreeView*); gint connection_click (GdkEventButton *ev, Gtk::TreeView*);
void connection_selected (gint, gint, GdkEvent *, bool); void connection_selection_changed (Gtk::TreeView&, Glib::RefPtr<Gtk::ListStore>&);
sigc::connection config_connection; sigc::connection config_connection;
sigc::connection connect_connection; sigc::connection connect_connection;

20
gtk2_ardour/editor.cc
View file

@ -802,7 +802,7 @@ Editor::initialize_canvas ()
/* adjust sensitivity for "picking" items */ /* adjust sensitivity for "picking" items */
// GNOME_CANVAS(track_gnome_canvas)->close_enough = 2; // GNOME_CANVAS(track_canvas)->close_enough = 2;
track_canvas.signal_event().connect (slot (*this, &Editor::track_canvas_event)); track_canvas.signal_event().connect (slot (*this, &Editor::track_canvas_event));
track_canvas.set_name ("EditorMainCanvas"); track_canvas.set_name ("EditorMainCanvas");
@ -916,7 +916,7 @@ Editor::initialize_canvas ()
transport_punchout_line->hide(); transport_punchout_line->hide();
// used to show zoom mode active zooming // used to show zoom mode active zooming
zoom_rect = new Canvas::Simplerect (track_gnome_canvas.root(), 0.0, 0.0, 0.0, 0.0); zoom_rect = new Canvas::Simplerect (track_canvas.root(), 0.0, 0.0, 0.0, 0.0);
zoom_rect->property_fill_color_rgba() << color_map[cZoomRectFill]; zoom_rect->property_fill_color_rgba() << color_map[cZoomRectFill];
zoom_rect->property_outline_color_rgba() << color_map[cZoomRect]; zoom_rect->property_outline_color_rgba() << color_map[cZoomRect];
zoom_rect->property_outline_pixels() << 1; zoom_rect->property_outline_pixels() << 1;
@ -925,7 +925,7 @@ Editor::initialize_canvas ()
zoom_rect.signal_event().connect (slot (*this, &PublicEditor::canvas_zoom_rect_event)); zoom_rect.signal_event().connect (slot (*this, &PublicEditor::canvas_zoom_rect_event));
// used as rubberband rect // used as rubberband rect
rubberband_rect = new Canvas::Simplerect (track_gnome_canvas.root(), 0.0, 0.0, 0.0, 0.0); rubberband_rect = new Canvas::Simplerect (track_canvas.root(), 0.0, 0.0, 0.0, 0.0);
rubberband_rect->property_outline_color_rgba() << color_map[cRubberBandRect]; rubberband_rect->property_outline_color_rgba() << color_map[cRubberBandRect];
rubberband_rect->property_fill_color_rgba() << (guint32) color_map[cRubberBandRectFill]; rubberband_rect->property_fill_color_rgba() << (guint32) color_map[cRubberBandRectFill];
rubberband_rect->property_outline_pixels() << 1; rubberband_rect->property_outline_pixels() << 1;
@ -982,7 +982,7 @@ Editor::initialize_canvas ()
double time_height = timebar_height * 5; double time_height = timebar_height * 5;
double time_width = FLT_MAX/frames_per_unit; 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); gnome_canvas_set_scroll_region (GNOME_CANVAS(time_canvas), 0.0, 0.0, time_width, time_height);
edit_cursor = new Cursor (*this, "blue", (GtkSignalFunc) _canvas_edit_cursor_event); edit_cursor = new Cursor (*this, "blue", (GtkSignalFunc) _canvas_edit_cursor_event);
playhead_cursor = new Cursor (*this, "red", (GtkSignalFunc) _canvas_playhead_cursor_event); playhead_cursor = new Cursor (*this, "red", (GtkSignalFunc) _canvas_playhead_cursor_event);
@ -1256,7 +1256,7 @@ Editor::track_canvas_allocate (GtkAllocation *alloc)
strcpy (txt, _(txt1)); strcpy (txt, _(txt1));
strcat (txt, _(txt2)); strcat (txt, _(txt2));
first_action_message = gnome_canvas_item_new (gnome_canvas_root(GNOME_CANVAS(track_gnome_canvas)), first_action_message = gnome_canvas_item_new (gnome_canvas_root(GNOME_CANVAS(track_canvas)),
gnome_canvas_text_get_type(), gnome_canvas_text_get_type(),
"fontdesc", font, "fontdesc", font,
"fill_color_rgba", color_map[cFirstActionMessage], "fill_color_rgba", color_map[cFirstActionMessage],
@ -1332,13 +1332,13 @@ Editor::reset_scrolling_region (GtkAllocation *alloc)
canvas_alloc_height = alloc->height; canvas_alloc_height = alloc->height;
canvas_alloc_width = alloc->width; canvas_alloc_width = alloc->width;
} else { } else {
canvas_alloc_height = track_gnome_canvas->allocation.height; canvas_alloc_height = track_canvas->allocation.height;
canvas_alloc_width = track_gnome_canvas->allocation.width; canvas_alloc_width = track_canvas->allocation.width;
} }
canvas_height = max (canvas_height, canvas_alloc_height); canvas_height = max (canvas_height, canvas_alloc_height);
gnome_canvas_set_scroll_region (GNOME_CANVAS(track_gnome_canvas), 0.0, 0.0, gnome_canvas_set_scroll_region (GNOME_CANVAS(track_canvas), 0.0, 0.0,
max (last_canvas_unit, canvas_alloc_width), max (last_canvas_unit, canvas_alloc_width),
canvas_height); canvas_height);
@ -3286,7 +3286,7 @@ Editor::track_canvas_drag_data_received (GdkDragContext *context,
double wx; double wx;
double wy; double wy;
gnome_canvas_window_to_world (GNOME_CANVAS(track_gnome_canvas), (double) x, (double) y, &wx, &wy); gnome_canvas_window_to_world (GNOME_CANVAS(track_canvas), (double) x, (double) y, &wx, &wy);
ev.type = GDK_BUTTON_RELEASE; ev.type = GDK_BUTTON_RELEASE;
ev.button.x = wx; ev.button.x = wx;
@ -3404,7 +3404,7 @@ Editor::flush_track_canvas ()
out this method entirely out this method entirely
*/ */
//gnome_canvas_update_now (GNOME_CANVAS(track_gnome_canvas)); //gnome_canvas_update_now (GNOME_CANVAS(track_canvas));
//gtk_main_iteration (); //gtk_main_iteration ();
} }

2
gtk2_ardour/editor_keyboard.cc
View file

@ -49,7 +49,7 @@ Editor::kbd_driver (sigc::slot<void,GdkEvent*> theslot, bool use_track_canvas, b
selection->set (entered_regionview); selection->set (entered_regionview);
} }
gnome_canvas_window_to_world (GNOME_CANVAS(track_gnome_canvas), x, y, &dx, &dy); gnome_canvas_window_to_world (GNOME_CANVAS(track_canvas), x, y, &dx, &dy);
ev.type = GDK_BUTTON_PRESS; ev.type = GDK_BUTTON_PRESS;
ev.button.x = dx; ev.button.x = dx;

1
gtk2_ardour/editor_mixer.cc
View file

@ -253,7 +253,6 @@ Editor::session_going_away ()
entered_regionview = 0; entered_regionview = 0;
entered_track = 0; entered_track = 0;
latest_regionview = 0; latest_regionview = 0;
region_list_display_drag_region = 0;
last_update_frame = 0; last_update_frame = 0;
drag_info.item = 0; drag_info.item = 0;
last_audition_region = 0; last_audition_region = 0;

6
gtk2_ardour/editor_mouse.cc
View file

@ -85,14 +85,14 @@ Editor::event_frame (GdkEvent* event, double* pcx, double* pcy)
case GDK_BUTTON_PRESS: case GDK_BUTTON_PRESS:
case GDK_2BUTTON_PRESS: case GDK_2BUTTON_PRESS:
case GDK_3BUTTON_PRESS: case GDK_3BUTTON_PRESS:
gnome_canvas_w2c_d (GNOME_CANVAS(track_gnome_canvas), event->button.x, event->button.y, pcx, pcy); gnome_canvas_w2c_d (GNOME_CANVAS(track_canvas), event->button.x, event->button.y, pcx, pcy);
break; break;
case GDK_MOTION_NOTIFY: case GDK_MOTION_NOTIFY:
gnome_canvas_w2c_d (GNOME_CANVAS(track_gnome_canvas), event->motion.x, event->motion.y, pcx, pcy); gnome_canvas_w2c_d (GNOME_CANVAS(track_canvas), event->motion.x, event->motion.y, pcx, pcy);
break; break;
case GDK_ENTER_NOTIFY: case GDK_ENTER_NOTIFY:
case GDK_LEAVE_NOTIFY: case GDK_LEAVE_NOTIFY:
gnome_canvas_w2c_d (GNOME_CANVAS(track_gnome_canvas), event->crossing.x, event->crossing.y, pcx, pcy); gnome_canvas_w2c_d (GNOME_CANVAS(track_canvas), event->crossing.x, event->crossing.y, pcx, pcy);
break; break;
default: default:
warning << string_compose (_("Editor::event_frame() used on unhandled event type %1"), event->type) << endmsg; warning << string_compose (_("Editor::event_frame() used on unhandled event type %1"), event->type) << endmsg;

4
gtk2_ardour/editor_ops.cc
View file

@ -1471,7 +1471,7 @@ Editor::insert_region_list_drag (AudioRegion& region)
track_canvas->get_pointer (x, y); track_canvas->get_pointer (x, y);
gnome_canvas_window_to_world (GNOME_CANVAS(track_gnome_canvas), x, y, &wx, &wy); gnome_canvas_window_to_world (GNOME_CANVAS(track_canvas), x, y, &wx, &wy);
GdkEvent event; GdkEvent event;
event.type = GDK_BUTTON_RELEASE; event.type = GDK_BUTTON_RELEASE;
@ -3168,7 +3168,7 @@ Editor::mouse_paste ()
double wx, wy; double wx, wy;
track_canvas->get_pointer (x, y); track_canvas->get_pointer (x, y);
gnome_canvas_window_to_world (GNOME_CANVAS(track_gnome_canvas), x, y, &wx, &wy); gnome_canvas_window_to_world (GNOME_CANVAS(track_canvas), x, y, &wx, &wy);
GdkEvent event; GdkEvent event;
event.type = GDK_BUTTON_RELEASE; event.type = GDK_BUTTON_RELEASE;

4
gtk2_ardour/editor_rulers.cc
View file

@ -225,8 +225,8 @@ Editor::ruler_mouse_motion (GdkEventMotion* ev)
time_canvas_event_box.get_window()->get_pointer (x, y, state); time_canvas_event_box.get_window()->get_pointer (x, y, state);
gnome_canvas_window_to_world (GNOME_CANVAS(track_gnome_canvas), x, y, &wcx, &wcy); gnome_canvas_window_to_world (GNOME_CANVAS(track_canvas), x, y, &wcx, &wcy);
gnome_canvas_w2c_d (GNOME_CANVAS(track_gnome_canvas), wcx, wcy, &cx, &cy); gnome_canvas_w2c_d (GNOME_CANVAS(track_canvas), wcx, wcy, &cx, &cy);
jack_nframes_t where = leftmost_frame + pixel_to_frame (x); jack_nframes_t where = leftmost_frame + pixel_to_frame (x);

4
gtk2_ardour/io_selector.cc
View file

@ -172,7 +172,7 @@ IOSelector::IOSelector (Session& sess, IO& ior, bool input)
port_display_scroller.set_name ("IOSelectorNotebook"); port_display_scroller.set_name ("IOSelectorNotebook");
port_display_scroller.set_border_width (0); port_display_scroller.set_border_width (0);
port_display_scroller.set_size_request (-1, 170); port_display_scroller.set_size_request (-1, 170);
port_display_scroller.add_with_viewport (port_box); port_display_scroller.add (port_box);
port_display_scroller.set_policy (Gtk::POLICY_NEVER, port_display_scroller.set_policy (Gtk::POLICY_NEVER,
Gtk::POLICY_AUTOMATIC); Gtk::POLICY_AUTOMATIC);
@ -332,7 +332,7 @@ IOSelector::rescan ()
Gtk::CList *client_port_display = manage (new Gtk::CList (1)); Gtk::CList *client_port_display = manage (new Gtk::CList (1));
ScrolledWindow *scroller = manage (new ScrolledWindow); ScrolledWindow *scroller = manage (new ScrolledWindow);
scroller->add_with_viewport (*client_port_display); scroller->add (*client_port_display);
scroller->set_policy (Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC); scroller->set_policy (Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
client_box->pack_start (*scroller); client_box->pack_start (*scroller);

4
gtk2_ardour/location_ui.cc
View file

@ -611,7 +611,7 @@ LocationUI::LocationUI ()
location_vpacker.pack_start (punch_edit_row, false, false); location_vpacker.pack_start (punch_edit_row, false, false);
location_rows.set_name("LocationLocRows"); location_rows.set_name("LocationLocRows");
location_rows_scroller.add_with_viewport (location_rows); location_rows_scroller.add (location_rows);
location_rows_scroller.set_name ("LocationLocRowsScroller"); location_rows_scroller.set_name ("LocationLocRowsScroller");
location_rows_scroller.set_policy (Gtk::POLICY_NEVER, Gtk::POLICY_AUTOMATIC); location_rows_scroller.set_policy (Gtk::POLICY_NEVER, Gtk::POLICY_AUTOMATIC);
location_rows_scroller.set_size_request (-1, 130); location_rows_scroller.set_size_request (-1, 130);
@ -632,7 +632,7 @@ LocationUI::LocationUI ()
range_rows.set_name("LocationRangeRows"); range_rows.set_name("LocationRangeRows");
range_rows_scroller.add_with_viewport (range_rows); range_rows_scroller.add (range_rows);
range_rows_scroller.set_name ("LocationRangeRowsScroller"); range_rows_scroller.set_name ("LocationRangeRowsScroller");
range_rows_scroller.set_policy (Gtk::POLICY_NEVER, Gtk::POLICY_AUTOMATIC); range_rows_scroller.set_policy (Gtk::POLICY_NEVER, Gtk::POLICY_AUTOMATIC);
range_rows_scroller.set_size_request (-1, 130); range_rows_scroller.set_size_request (-1, 130);