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

miscellany

Browse source 
git-svn-id: svn://localhost/trunk/ardour2@129 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2005-11-27 14:09:50 +00:00
parent 595d9ac41b
commit 8f54e41058
6 changed files with 26 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

5
gtk2_ardour/ardour_ui.h
View file

@ -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 ();

16
gtk2_ardour/ardour_ui_dialogs.cc
View file

@ -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 ()
{

34
gtk2_ardour/editor.cc
View file

@ -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");
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);
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::SimpleLine (*meter_group, 0, timebar_height, max_canvas_coordinate, timebar_height);
meter_line->property_color_rgba() = RGBA_TO_UINT (0,0,0,255);
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");
marker_line_points.push_back(Gnome::Art::Point (0, timebar_height));
marker_line_points.push_back(Gnome::Art::Point(max_canvas_coordinate, timebar_height));
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));

16
gtk2_ardour/editor.h
View file

@ -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;

22
gtk2_ardour/playlist_selector.cc
View file

@ -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;

2
gtk2_ardour/playlist_selector.h
View file

@ -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;