miscellany

git-svn-id: svn://localhost/trunk/ardour2@129 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/gtk2_ardour/ardour_ui.h b/gtk2_ardour/ardour_ui.h
index ec18a5637e76f6671a3b2a3bfc1b436d7f933f37..38cbfc5fb64a42728cf008b2d36dd5a1d1295405 100644 (file)
--- a/gtk2_ardour/ardour_ui.h
+++ b/gtk2_ardour/ardour_ui.h
@@ -492,7 +492,6 @@ class ARDOUR_UI : public Gtkmm2ext::UI
        Gtk::MenuItem *export_item;
        Gtk::MenuItem *close_item;
 
-       Gtk::CheckMenuItem *meter_bridge_dialog_check;
        Gtk::CheckMenuItem *connection_editor_check;
        Gtk::CheckMenuItem *route_params_check;
        Gtk::CheckMenuItem *locations_dialog_check;
@@ -630,9 +629,6 @@ class ARDOUR_UI : public Gtkmm2ext::UI
        PublicEditor     *editor;
        int         create_editor ();
 
-       MeterBridge  *meter_bridge;
-       int          create_meter_bridge ();
-
        RouteParams_UI *route_params;
        int             create_route_params ();
 
@@ -642,7 +638,6 @@ class ARDOUR_UI : public Gtkmm2ext::UI
        LocationUI *location_ui;
        int         create_location_ui ();
 
-       void meter_bridge_hiding ();
        void location_ui_hiding ();
        void big_clock_hiding ();
        void route_params_hiding ();

diff --git a/gtk2_ardour/ardour_ui_dialogs.cc b/gtk2_ardour/ardour_ui_dialogs.cc
index 99ba92ab0b3b4e9ce988de634fa03ecc36cff017..9caf2396b2985c02ea9dcf63f00413bd7dcb2b1d 100644 (file)
--- a/gtk2_ardour/ardour_ui_dialogs.cc
+++ b/gtk2_ardour/ardour_ui_dialogs.cc
@@ -227,22 +227,6 @@ ARDOUR_UI::unload_session ()
        return 0;
 }
 
-int
-ARDOUR_UI::create_meter_bridge ()
-{
-       if (meter_bridge == 0) {
-               meter_bridge = new MeterBridge ();
-               meter_bridge->signal_unmap().connect (mem_fun(*this, &ARDOUR_UI::meter_bridge_hiding));
-       }
-       return 0;
-}
-
-void
-ARDOUR_UI::meter_bridge_hiding()
-{
-       // meter_bridge_dialog_check->set_active(false);
-}
-
 int
 ARDOUR_UI::create_connection_editor ()
 {

diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index 233875728558986e7ad6fe3ccab6dea9bdcc905f..7c7b5ad5bb940b4c99118e91f57769400a291ece 100644 (file)
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -946,35 +946,21 @@ Editor::initialize_canvas ()
        transport_marker_bar->signal_event().connect (bind (mem_fun (*this, &Editor::canvas_transport_marker_bar_event), transport_marker_bar));
        
        /* separator lines */
-
-       tempo_line_points.push_back(Gnome::Art::Point(0, timebar_height));
-       tempo_line_points.push_back(Gnome::Art::Point(max_canvas_coordinate, timebar_height));
        
-       tempo_line = new ArdourCanvas::Line (*tempo_group, tempo_line_points);
-       tempo_line->set_property ("width_pixels", 0);
-       tempo_line->property_fill_color().set_value ("#000000");
-
-       meter_line_points.push_back(Gnome::Art::Point (0, timebar_height));
-       meter_line_points.push_back(Gnome::Art::Point(max_canvas_coordinate, timebar_height));
-
-       meter_line = new ArdourCanvas::Line (*meter_group, meter_line_points);
-       meter_line->set_property ("width_pixels", 0);
-       meter_line->property_fill_color().set_value ("#000000");
+       tempo_line = new ArdourCanvas::SimpleLine (*tempo_group, 0, timebar_height, max_canvas_coordinate, timebar_height);
+       tempo_line->property_color_rgba() = RGBA_TO_UINT (0,0,0,255);
 
-       marker_line_points.push_back(Gnome::Art::Point (0, timebar_height));
-       marker_line_points.push_back(Gnome::Art::Point(max_canvas_coordinate, timebar_height));
+       meter_line = new ArdourCanvas::SimpleLine (*meter_group, 0, timebar_height, max_canvas_coordinate, timebar_height);
+       meter_line->property_color_rgba() = RGBA_TO_UINT (0,0,0,255);
 
-       marker_line =  new ArdourCanvas::Line (*marker_group, marker_line_points);
-       marker_line->set_property ("width_pixels", 0);
-       marker_line->property_fill_color().set_value ("#000000");
+       marker_line = new ArdourCanvas::SimpleLine (*marker_group, 0, timebar_height, max_canvas_coordinate, timebar_height);
+       marker_line->property_color_rgba() = RGBA_TO_UINT (0,0,0,255);
        
-       range_marker_line =  new ArdourCanvas::Line (*range_marker_group, marker_line_points);
-       range_marker_line->set_property ("width_pixels", 0);
-       range_marker_line->property_fill_color().set_value ("#000000");
+       range_marker_line = new ArdourCanvas::SimpleLine (*range_marker_group, 0, timebar_height, max_canvas_coordinate, timebar_height);
+       range_marker_line->property_color_rgba() = RGBA_TO_UINT (0,0,0,255);
 
-       transport_marker_line =  new ArdourCanvas::Line (*transport_marker_group, marker_line_points);
-       transport_marker_line->set_property ("width_pixels", 0);
-       transport_marker_line->property_fill_color().set_value ("#000000");
+       transport_marker_line = new ArdourCanvas::SimpleLine (*transport_marker_group, 0, timebar_height, max_canvas_coordinate, timebar_height);
+       transport_marker_line->property_color_rgba() = RGBA_TO_UINT (0,0,0,255);
 
        ZoomChanged.connect (bind (mem_fun(*this, &Editor::update_loop_range_view), false));
        ZoomChanged.connect (bind (mem_fun(*this, &Editor::update_punch_range_view), false));

diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h
index fb97abc5153303bc61e372188db4e94120f7d07f..d8c8d2a229fa9b6fdef3a351f767ccba5607c04d 100644 (file)
--- a/gtk2_ardour/editor.h
+++ b/gtk2_ardour/editor.h
@@ -576,17 +576,11 @@ class Editor : public PublicEditor
        ArdourCanvas::SimpleRect* transport_marker_bar;
 
        
-       ArdourCanvas::Line* tempo_line;
-       ArdourCanvas::Line* meter_line;
-       ArdourCanvas::Line* marker_line;
-       ArdourCanvas::Line* range_marker_line;
-       ArdourCanvas::Line* transport_marker_line;
-
-       ArdourCanvas::Points tempo_line_points;
-       ArdourCanvas::Points meter_line_points;
-       ArdourCanvas::Points marker_line_points;
-       ArdourCanvas::Points range_marker_line_points;
-       ArdourCanvas::Points transport_marker_line_points;
+       ArdourCanvas::SimpleLine* tempo_line;
+       ArdourCanvas::SimpleLine* meter_line;
+       ArdourCanvas::SimpleLine* marker_line;
+       ArdourCanvas::SimpleLine* range_marker_line;
+       ArdourCanvas::SimpleLine* transport_marker_line;
 
        Gtk::Label  minsec_label;
        Gtk::Label  bbt_label;

diff --git a/gtk2_ardour/playlist_selector.cc b/gtk2_ardour/playlist_selector.cc
index 262890e6cb9c551c7b908a26f292bf80e770fc19..512695aad7b64075edb66fd7a30125d2592b244e 100644 (file)
--- a/gtk2_ardour/playlist_selector.cc
+++ b/gtk2_ardour/playlist_selector.cc
@@ -42,12 +42,11 @@ using namespace Gtk;
 using namespace ARDOUR;
 
 PlaylistSelector::PlaylistSelector ()
-       : ArdourDialog ("playlist selector"),
-         close_button (_("close"))
+       : ArdourDialog ("playlist selector")
 {
        rui = 0;
        
-       set_position (Gtk::WIN_POS_MOUSE);
+       set_position (WIN_POS_MOUSE);
        set_name ("PlaylistSelectorWindow");
        set_title (_("ardour: playlists"));
        set_modal(true);
@@ -59,16 +58,17 @@ PlaylistSelector::PlaylistSelector ()
        tree.append_column (_("Playlists grouped by track"), columns.text);
 
        scroller.add (tree);
-       scroller.set_policy (Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
+       scroller.set_policy (POLICY_AUTOMATIC, POLICY_AUTOMATIC);
 
-       close_button.signal_clicked().connect (mem_fun(*this, &PlaylistSelector::close_button_click));
+       // GTK2FIX do we need this stuff or is GTK applying some policy now?
+       //set_border_width (6);
+       // set_spacing (12);
 
-       vpacker.set_border_width (6);
-       vpacker.set_spacing (12);
-       vpacker.pack_start (scroller);
-       vpacker.pack_start (close_button, false, false);
+       get_vbox()->pack_start (scroller);
+
+       Button* b = add_button (_("close"), RESPONSE_CANCEL);
+       b->signal_clicked().connect (mem_fun(*this, &PlaylistSelector::close_button_click));
 
-       add (vpacker);
 }
 
 PlaylistSelector::~PlaylistSelector ()
@@ -108,7 +108,7 @@ PlaylistSelector::show_for (RouteUI* ruix)
 
        this_ds = rui->get_diskstream();
 
-       Gtk::TreeModel::Row others = *(model->append ());
+       TreeModel::Row others = *(model->append ());
 
        others[columns.text] = _("Other tracks");
        others[columns.playlist] = 0;

diff --git a/gtk2_ardour/playlist_selector.h b/gtk2_ardour/playlist_selector.h
index 7c5c18582b9b4c14d72b48417453b0f8aebf78e2..863d6cc7f31e4a821f7f0b8830880deff47e2514 100644 (file)
--- a/gtk2_ardour/playlist_selector.h
+++ b/gtk2_ardour/playlist_selector.h
@@ -49,9 +49,7 @@ class PlaylistSelector : public ArdourDialog
        typedef std::map<ARDOUR::id_t,std::list<ARDOUR::Playlist*>*> DSPL_Map;
 
        ARDOUR::Session* session;
-       Gtk::VBox vpacker;
        Gtk::ScrolledWindow scroller;
-       Gtk::Button close_button;
        DSPL_Map dspl_map;
        RouteUI* rui;