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

brought the track/bus inspector back to life

Browse source 
git-svn-id: svn://localhost/trunk/ardour2@493 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Jesse Chappell 2006-05-06 21:01:18 +00:00
parent 5299f6ae79
commit c091b877cf
4 changed files with 38 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

1
gtk2_ardour/ardour.menus
View file

@ -190,6 +190,7 @@
<menuitem action='goto-mixer'/>
<menuitem action='ToggleOptionsEditor'/>
<menuitem action='ToggleSoundFileBrowser'/>
<menuitem action='ToggleInspector'/>
<menuitem action='ToggleConnections'/>
<menuitem action='ToggleLocations'/>
<menuitem action='ToggleColorManager'/>

21
gtk2_ardour/ardour2_ui.rc
View file

@ -678,6 +678,16 @@ style "track_list_display" = "small_bold_text"
base[SELECTED] = { 0, 0, 0 }
}
style "inspector_track_list_display" = "track_list_display"
{
text[ACTIVE] = { 0.8, 0.8, 0.8 }
base[NORMAL] = { 0, 0, 0 }
base[ACTIVE] = { 0.2, 0.2, 0.2 }
base[INSENSITIVE] = { 0, 0, 0 }
base[SELECTED] = { 0.3, 0.3, 0.4 }
}
style "redirect_list_display"
{
GtkTreeView::horizontal-separator = 0
@ -701,6 +711,11 @@ style "redirect_list_display"
fg[ACTIVE] = { 0.5, 1.0, 1.0 } # used for active
}
style "inspector_redirect_list_display" = "redirect_list_display"
{
base[SELECTED] = { 0.3, 0.3, 0.3 }
}
# MixerPanZone:
#
# the NORMAL fg color is used for the pan puck
@ -1101,9 +1116,9 @@ widget "*ConnectionEditorPortListSelected" style "selected_io_selector_port_list
widget "*ConnectionEditorNotebook" style "io_selector_notebook"
widget "*ConnectionEditorNotebookTab" style "io_selector_notebook"
widget "*ConnectionEditorFrame" style "base_frame"
widget "*RouteParamsListDisplay" style "track_list_display"
widget "*RouteParamsPreListDisplay" style "track_list_display"
widget "*RouteParamsPostListDisplay" style "track_list_display"
widget "*RouteParamsListDisplay" style "inspector_track_list_display"
widget "*RouteParamsPreListDisplay" style "inspector_redirect_list_display"
widget "*RouteParamsPostListDisplay" style "inspector_redirect_list_display"
widget "*TearOffArrow" style "tearoff_arrow"
widget "*RouteParamsTitleButton" style "medium_text"
widget "*RouteParamsTitleLabel" style "medium_text"

5
gtk2_ardour/redirect_box.cc
View file

@ -303,7 +303,12 @@ RedirectBox::redirect_button_press_event (GdkEventButton *ev)
ret = true;
}
else if (redirect && ev->button == 1 && selected) {
// this is purely informational but necessary
RedirectSelected (redirect); // emit
}
return ret;
}

24
gtk2_ardour/route_params_ui.cc
View file

@ -125,7 +125,7 @@ RouteParams_UI::RouteParams_UI (AudioEngine& eng)
route_vpacker.pack_start (route_hpacker, true, true);
list_hpane.add1 (list_vpacker);
list_hpane.pack1 (list_vpacker);
list_hpane.add2 (route_vpacker);
list_hpane.set_position(110);
@ -133,9 +133,11 @@ RouteParams_UI::RouteParams_UI (AudioEngine& eng)
pre_redir_hpane.set_position(110);
post_redir_hpane.set_position(110);
global_vpacker.pack_start (list_hpane, true, true);
//global_vpacker.pack_start (list_hpane, true, true);
//get_vbox()->pack_start (global_vpacker);
get_vbox()->pack_start (list_hpane);
add (global_vpacker);
set_name ("RouteParamsWindow");
set_default_size (620,370);
set_title (_("ardour: track/bus inspector"));
@ -217,14 +219,16 @@ RouteParams_UI::setup_redirect_boxes()
pre_redirect_box = new RedirectBox(PreFader, *session, *_route, *_plugin_selector, _rr_selection);
post_redirect_box = new RedirectBox(PostFader, *session, *_route, *_plugin_selector, _rr_selection);
pre_redir_hpane.add1 (*pre_redirect_box);
post_redir_hpane.add1 (*post_redirect_box);
pre_redir_hpane.pack1 (*pre_redirect_box);
post_redir_hpane.pack1 (*post_redirect_box);
pre_redirect_box->RedirectSelected.connect (bind (mem_fun(*this, &RouteParams_UI::redirect_selected), PreFader));
pre_redirect_box->RedirectUnselected.connect (bind (mem_fun(*this, &RouteParams_UI::redirect_selected), PreFader));
post_redirect_box->RedirectSelected.connect (bind (mem_fun(*this, &RouteParams_UI::redirect_selected), PostFader));
post_redirect_box->RedirectUnselected.connect (bind (mem_fun(*this, &RouteParams_UI::redirect_selected), PostFader));
pre_redir_hpane.show_all();
post_redir_hpane.show_all();
}
}
@ -567,7 +571,7 @@ RouteParams_UI::redirect_selected (ARDOUR::Redirect *redirect, ARDOUR::Placement
_pre_plugin_conn = plugin_insert->plugin().GoingAway.connect (bind (mem_fun(*this, &RouteParams_UI::plugin_going_away), PreFader));
plugin_ui->start_updating (0);
_active_pre_view = plugin_ui;
pre_redir_hpane.add2 (*_active_pre_view);
pre_redir_hpane.pack2 (*_active_pre_view);
pre_redir_hpane.show_all();
}
else {
@ -575,7 +579,7 @@ RouteParams_UI::redirect_selected (ARDOUR::Redirect *redirect, ARDOUR::Placement
_post_plugin_conn = plugin_insert->plugin().GoingAway.connect (bind (mem_fun(*this, &RouteParams_UI::plugin_going_away), PostFader));
plugin_ui->start_updating (0);
_active_post_view = plugin_ui;
post_redir_hpane.add2 (*_active_post_view);
post_redir_hpane.pack2 (*_active_post_view);
post_redir_hpane.show_all();
}
@ -587,7 +591,7 @@ RouteParams_UI::redirect_selected (ARDOUR::Redirect *redirect, ARDOUR::Placement
cleanup_pre_view();
_pre_plugin_conn = port_insert->GoingAway.connect (mem_fun(*this, &RouteParams_UI::redirect_going_away));
_active_pre_view = portinsert_ui;
pre_redir_hpane.add2 (*_active_pre_view);
pre_redir_hpane.pack2 (*_active_pre_view);
portinsert_ui->redisplay();
pre_redir_hpane.show_all();
}
@ -595,7 +599,7 @@ RouteParams_UI::redirect_selected (ARDOUR::Redirect *redirect, ARDOUR::Placement
cleanup_post_view();
_post_plugin_conn = port_insert->GoingAway.connect (mem_fun(*this, &RouteParams_UI::redirect_going_away));
_active_post_view = portinsert_ui;
post_redir_hpane.add2 (*_active_post_view);
post_redir_hpane.pack2 (*_active_post_view);
portinsert_ui->redisplay();
post_redir_hpane.show_all();
}