diff --git a/gtk2_ardour/SConscript b/gtk2_ardour/SConscript index 1511516562..b53cfb224f 100644 --- a/gtk2_ardour/SConscript +++ b/gtk2_ardour/SConscript @@ -16,16 +16,19 @@ domain = 'gtk_ardour' gtkardour.Append(DOMAIN=domain, MAJOR=1,MINOR=0,MICRO=2) gtkardour.Append(CXXFLAGS="-DPACKAGE=\\\"" + domain + "\\\"") -gtkardour.Append(CCFLAGS="-DLIBSIGC_DISABLE_DEPRECATED") +gtkardour.Append(CXXFLAGS="-DLIBSIGC_DISABLE_DEPRECATED") +gtkardour.Append(CXXFLAGS="-DFLOWCANVAS_AA") gtkardour.Append(PACKAGE=domain) gtkardour.Append(POTFILE=domain + '.pot') gtkardour.Merge ([ libraries['ardour'], libraries['gtkmm2ext'], + libraries['flowcanvas'], libraries['midi++2'], libraries['pbd3'], libraries['gtkmm2'], + libraries['libgnomecanvas2'], libraries['libgnomecanvasmm'], libraries['sysmidi'], libraries['sndfile'], @@ -36,7 +39,6 @@ gtkardour.Merge ([ libraries['gdkmm2'], libraries['sigc2'], libraries['gtk2'], - libraries['libgnomecanvas2'], libraries['xml'], libraries['soundtouch'], libraries['samplerate'], diff --git a/gtk2_ardour/ardour_ui_ed.cc b/gtk2_ardour/ardour_ui_ed.cc index aa162d1d92..42bfadea93 100644 --- a/gtk2_ardour/ardour_ui_ed.cc +++ b/gtk2_ardour/ardour_ui_ed.cc @@ -150,7 +150,7 @@ ARDOUR_UI::install_actions () register_action (common_actions, X_("GotoMixer"), _("Mixer"), mem_fun(*this, &ARDOUR_UI::goto_mixer_window)); register_toggle_action (common_actions, X_("ToggleSoundFileBrowser"), _("Sound File Browser"), mem_fun(*this, &ARDOUR_UI::toggle_sound_file_browser)); register_toggle_action (common_actions, X_("ToggleOptionsEditor"), _("Options Editor"), mem_fun(*this, &ARDOUR_UI::toggle_options_window)); - register_toggle_action (common_actions, X_("ToggleAudioLibrary"), _("Audio Library"), mem_fun(*this, &ARDOUR_UI::toggle_sfdb_window)); + register_toggle_action (common_actions, X_("ToggleAudioLibrary"), _("Audio Library"), mem_fun(*this, &ARDOUR_UI::toggle_sound_file_browser)); act = register_toggle_action (common_actions, X_("ToggleInspector"), _("Track/Bus Inspector"), mem_fun(*this, &ARDOUR_UI::toggle_route_params_window)); session_sensitive_actions.push_back (act); act = register_toggle_action (common_actions, X_("ToggleConnections"), _("Connections"), mem_fun(*this, &ARDOUR_UI::toggle_connection_editor)); diff --git a/gtk2_ardour/connection_editor.h b/gtk2_ardour/connection_editor.h index 1d0c140c4f..becc852638 100644 --- a/gtk2_ardour/connection_editor.h +++ b/gtk2_ardour/connection_editor.h @@ -35,6 +35,7 @@ using __gnu_cxx::slist; #include #include #include +#include #include "ardour_dialog.h" @@ -62,9 +63,9 @@ class ConnectionEditor : public ArdourDialog { struct ConnectionDisplayModelColumns : public Gtk::TreeModel::ColumnRecord { - SnapshotDisplayModelColumns() { - add (visible_name); - add (real_name); + ConnectionDisplayModelColumns() { + add (name); + add (connection); } Gtk::TreeModelColumn name; Gtk::TreeModelColumn connection; diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h index 6095f561af..a122a4cd99 100644 --- a/gtk2_ardour/editor.h +++ b/gtk2_ardour/editor.h @@ -31,11 +31,18 @@ #include -#include #include #include + #include #include + +#include +#include +#include +#include +#include + #include #include @@ -196,14 +203,14 @@ class Editor : public PublicEditor */ if (pixel >= 0) { - return (jack_nframes_t) rint (pixel * frames_per_unit * GNOME_CANVAS(track_gnome_canvas.gobj())->pixels_per_unit); + return (jack_nframes_t) rint (pixel * frames_per_unit * GNOME_CANVAS(track_canvas.gobj())->pixels_per_unit); } else { return 0; } } gulong frame_to_pixel (jack_nframes_t frame) { - return (gulong) rint ((frame / (frames_per_unit * GNOME_CANVAS(track_gnome_canvas.gobj())->pixels_per_unit))); + return (gulong) rint ((frame / (frames_per_unit * GNOME_CANVAS(track_canvas.gobj())->pixels_per_unit))); } /* selection */ @@ -471,8 +478,8 @@ class Editor : public PublicEditor GdkCursor *current_canvas_cursor; - Gnome::CanvasAA track_canvas; - Gnome::CanvasAA time_canvas; + Gnome::Canvas::CanvasAA track_canvas; + Gnome::Canvas::CanvasAA time_canvas; Gnome::Canvas::Text* first_action_message; Gnome::Canvas::Text* verbose_canvas_cursor; @@ -566,11 +573,11 @@ class Editor : public PublicEditor guint32 visible_timebars; Gtk::Menu *editor_ruler_menu; - Gnome::Canvas::SimpleRect* tempo_bar; - Gnome::Canvas::SimpleRect* meter_bar; - Gnome::Canvas::SimpleRect* marker_bar; - Gnome::Canvas::SimpleRect* range_marker_bar; - Gnome::Canvas::SimpleRect* transport_marker_bar; + Gnome::Canvas::Rect* tempo_bar; + Gnome::Canvas::Rect* meter_bar; + Gnome::Canvas::Rect* marker_bar; + Gnome::Canvas::Rect* range_marker_bar; + Gnome::Canvas::Rect* transport_marker_bar; Gnome::Canvas::Line* tempo_line; diff --git a/gtk2_ardour/io_menu.h b/gtk2_ardour/io_menu.h deleted file mode 100644 index b1fb785128..0000000000 --- a/gtk2_ardour/io_menu.h +++ /dev/null @@ -1,25 +0,0 @@ -/* - Copyright (C) 1999-2002 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 - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - - $Id$ -*/ - -#ifndef __gtk_ardour_io_menu_h__ -#define __gtk_ardour_io_menu_h__ - - -#endif /* __gtk_ardour_io_menu_h__ */ diff --git a/libs/ardour/SConscript b/libs/ardour/SConscript index e9b38e75c2..40e505e0f3 100644 --- a/libs/ardour/SConscript +++ b/libs/ardour/SConscript @@ -15,7 +15,7 @@ domain = 'libardour' ardour.Append(DOMAIN = domain, MAJOR = 1, MINOR = 0, MICRO = 0) ardour.Append(CXXFLAGS = "-DPACKAGE=\\\"" + domain + "\\\"") -ardour.Append(CCFLAGS="-DLIBSIGC_DISABLE_DEPRECATED") +ardour.Append(CXXFLAGS="-DLIBSIGC_DISABLE_DEPRECATED") ardour.Append(PACKAGE = domain) ardour.Append(POTFILE = domain + '.pot') diff --git a/libs/flowcanvas/SConscript b/libs/flowcanvas/SConscript index 02bd67dfa6..59d97798d0 100644 --- a/libs/flowcanvas/SConscript +++ b/libs/flowcanvas/SConscript @@ -25,8 +25,8 @@ flowcanvas.Merge ([ domain = 'libflowcanvas' -flowcanvas.Append(DOMAIN=domain,MAJOR=0,MINOR=8,MICRO=1) -flowcanvas.Append(CXXFLAGS="-DPACKAGE=\\\"" + domain + "\\\"") +flowcanvas.Append(DOMAIN=domain,MAJOR=0,MINOR=0,MICRO=1) +flowcanvas.Append(CXXFLAGS="-DFLOWCANVAS_AA") flowcanvas_files = Split(""" src/Connection.cpp @@ -40,6 +40,6 @@ libflowcanvas = flowcanvas.StaticLibrary('flowcanvas', flowcanvas_files) Default(libflowcanvas) env.Alias('tarball', env.Distribute (env['DISTTREE'], - [ 'SConscript'] + + ['SConscript'] + flowcanvas_files + glob.glob('flowcanvas/*.h'))) diff --git a/libs/flowcanvas/flowcanvas/FlowCanvas.h b/libs/flowcanvas/flowcanvas/FlowCanvas.h index 5110678875..ab6c85f410 100644 --- a/libs/flowcanvas/flowcanvas/FlowCanvas.h +++ b/libs/flowcanvas/flowcanvas/FlowCanvas.h @@ -52,11 +52,11 @@ class Module; * * \ingroup FlowCanvas */ -#ifdef ANTI_ALIAS +#ifdef FLOWCANVAS_AA class FlowCanvas : public Gnome::Canvas::CanvasAA #else class FlowCanvas : public Gnome::Canvas::Canvas -#endif +#endif // FLOWCANVAS_AA { public: FlowCanvas(double width, double height); diff --git a/libs/gtkmm2ext/SConscript b/libs/gtkmm2ext/SConscript index 3d30ed1a24..634209da59 100644 --- a/libs/gtkmm2ext/SConscript +++ b/libs/gtkmm2ext/SConscript @@ -27,7 +27,7 @@ domain = 'libgtkmm2ext' gtkmm2ext.Append(DOMAIN=domain,MAJOR=0,MINOR=8,MICRO=1) gtkmm2ext.Append(CXXFLAGS="-DPACKAGE=\\\"" + domain + "\\\"") -gtkmm2ext.Append(CCFLAGS="-DLIBSIGC_DISABLE_DEPRECATED") +gtkmm2ext.Append(CXXFLAGS="-DLIBSIGC_DISABLE_DEPRECATED") gtkmm2ext.Append(PACKAGE=domain) gtkmm2ext.Append(POTFILE=domain + '.pot') diff --git a/libs/gtkmm2ext/gtk_ui.cc b/libs/gtkmm2ext/gtk_ui.cc index 59f57d460e..eebd5e7b0d 100644 --- a/libs/gtkmm2ext/gtk_ui.cc +++ b/libs/gtkmm2ext/gtk_ui.cc @@ -28,7 +28,6 @@ #include #include -#include #include #include #include