#include <inttypes.h>
#include <glibmm/threads.h>
-#include <gtkmm2ext/utils.h>
-#include <gtkmm2ext/window_title.h>
+#include <gtkmm/stock.h>
#include "ardour/audioengine.h"
#include "ardour/audio_track.h"
#include "ardour/send.h"
#include "ardour/internal_send.h"
+#include "gtkmm2ext/utils.h"
+#include "gtkmm2ext/window_title.h"
+
#include "ardour_ui.h"
#include "gui_thread.h"
#include "io_selector.h"
#include "return_ui.h"
#include "route_params_ui.h"
#include "send_ui.h"
+#include "timers.h"
-#include "i18n.h"
+#include "pbd/i18n.h"
using namespace ARDOUR;
using namespace PBD;
using namespace Gtkmm2ext;
RouteParams_UI::RouteParams_UI ()
- : ArdourWindow (_("Tracks and Busses")),
- latency_apply_button (Stock::APPLY),
- track_menu(0)
+ : ArdourWindow (_("Tracks and Busses"))
+ , latency_apply_button (Stock::APPLY)
+ , track_menu(0)
{
insert_box = 0;
_input_iosel = 0;
route_param_frame.set_name("RouteParamsBaseFrame");
route_param_frame.set_shadow_type (Gtk::SHADOW_IN);
-
route_hpacker.pack_start (notebook, true, true);
route_vpacker.pack_start (title_label, false, false);
route_vpacker.pack_start (route_hpacker, true, true);
+ list_hpane.add (list_vpacker);
+ list_hpane.add (route_vpacker);
- list_hpane.pack1 (list_vpacker);
- list_hpane.add2 (route_vpacker);
-
- list_hpane.set_position(110);
-
- redir_hpane.set_position(110);
-
- //global_vpacker.pack_start (list_hpane, true, true);
- //get_vbox()->pack_start (global_vpacker);
add (list_hpane);
-
set_name ("RouteParamsWindow");
set_default_size (620,370);
set_wmclass (X_("ardour_route_parameters"), PROGRAM_NAME);
cleanup_processor_boxes();
// construct new redirect boxes
- insert_box = new ProcessorBox (_session, boost::bind (&RouteParams_UI::plugin_selector, this), _rr_selection, 0);
+ insert_box = new ProcessorBox (_session, boost::bind (&RouteParams_UI::plugin_selector, this), _p_selection, 0);
insert_box->set_route (_route);
boost::shared_ptr<AudioTrack> at = boost::dynamic_pointer_cast<AudioTrack>(_route);
if (at) {
at->FreezeChange.connect (route_connections, invalidator (*this), boost::bind (&RouteParams_UI::map_frozen, this), gui_context());
}
- redir_hpane.pack1 (*insert_box);
+ redir_hpane.add (*insert_box);
- insert_box->ProcessorSelected.connect (sigc::mem_fun(*this, &RouteParams_UI::redirect_selected));
+ insert_box->ProcessorSelected.connect (sigc::mem_fun(*this, &RouteParams_UI::redirect_selected)); //note: this indicates a double-click activation, not just a "selection"
insert_box->ProcessorUnselected.connect (sigc::mem_fun(*this, &RouteParams_UI::redirect_selected));
redir_hpane.show_all();
latency_widget->refresh();
char buf[128];
- snprintf (buf, sizeof (buf), _("Playback delay: %" PRId64 " samples"), _route->initial_delay());
+ snprintf (buf, sizeof (buf), _("Latency: %" PRId64 " samples"), _route->signal_latency ());
delay_label.set_text (buf);
}
}
void
RouteParams_UI::setup_latency_frame ()
{
- latency_widget = new LatencyGUI (*(_route->output()), _session->frame_rate(), AudioEngine::instance()->samples_per_cycle());
+ latency_widget = new LatencyGUI (*(_route->output()), _session->sample_rate(), AudioEngine::instance()->samples_per_cycle());
char buf[128];
- snprintf (buf, sizeof (buf), _("Playback delay: %" PRId64 " samples"), _route->initial_delay());
+ snprintf (buf, sizeof (buf), _("Latency: %" PRId64 " samples"), _route->signal_latency());
delay_label.set_text (buf);
latency_packer.pack_start (*latency_widget, false, false);
latency_packer.pack_start (delay_label);
latency_click_connection = latency_apply_button.signal_clicked().connect (sigc::mem_fun (*latency_widget, &LatencyGUI::finish));
- _route->signal_latency_changed.connect (latency_connections, invalidator (*this), boost::bind (&RouteParams_UI::refresh_latency, this), gui_context());
- _route->initial_delay_changed.connect (latency_connections, invalidator (*this), boost::bind (&RouteParams_UI::refresh_latency, this), gui_context());
+ _route->signal_latency_updated.connect (latency_connections, invalidator (*this), boost::bind (&RouteParams_UI::refresh_latency, this), gui_context());
latency_frame.add (latency_packer);
latency_frame.show_all ();
}
void
-RouteParams_UI::setup_io_frames()
+RouteParams_UI::setup_io_samples()
{
- cleanup_io_frames();
+ cleanup_io_samples();
// input
_input_iosel = new IOSelector (this, _session, _route->input());
}
void
-RouteParams_UI::cleanup_io_frames()
+RouteParams_UI::cleanup_io_samples()
{
if (_input_iosel) {
_input_iosel->Finished (IOSelector::Cancelled);
}
if (route == _route) {
- cleanup_io_frames();
+ cleanup_io_samples();
cleanup_view();
cleanup_processor_boxes();
route_display_model->clear();
- cleanup_io_frames();
+ cleanup_io_samples();
cleanup_view();
cleanup_processor_boxes();
cleanup_latency_frame ();
_route_processors_connection.disconnect ();
cleanup_processor_boxes();
cleanup_view();
- cleanup_io_frames();
+ cleanup_io_samples();
cleanup_latency_frame ();
}
_route = route;
//update_routeinfo (route);
- setup_io_frames();
+ setup_io_samples();
setup_processor_boxes();
setup_latency_frame ();
_route_processors_connection.disconnect ();
// remove from view
- cleanup_io_frames();
+ cleanup_io_samples();
cleanup_view();
cleanup_processor_boxes();
cleanup_latency_frame ();
if (track_menu == 0) {
track_menu = new Menu;
track_menu->set_name ("ArdourContextMenu");
- track_menu->items().push_back
- (MenuElem (_("Add Track or Bus"),
- sigc::bind (sigc::mem_fun (*(ARDOUR_UI::instance()), &ARDOUR_UI::add_route), (Gtk::Window*) 0)));
+ track_menu->items().push_back (MenuElem (_("Add Track or Bus"), sigc::mem_fun (*(ARDOUR_UI::instance()), &ARDOUR_UI::add_route)));
}
track_menu->popup (1, gtk_get_current_event_time());
}
send->DropReferences.connect (_processor_going_away_connection, invalidator (*this), boost::bind (&RouteParams_UI::processor_going_away, this, boost::weak_ptr<Processor>(proc)), gui_context());
_active_view = send_ui;
- redir_hpane.add2 (*_active_view);
+ redir_hpane.add (*_active_view);
redir_hpane.show_all();
} else if ((retrn = boost::dynamic_pointer_cast<Return> (proc)) != 0) {
retrn->DropReferences.connect (_processor_going_away_connection, invalidator (*this), boost::bind (&RouteParams_UI::processor_going_away, this, boost::weak_ptr<Processor>(proc)), gui_context());
_active_view = return_ui;
- redir_hpane.add2 (*_active_view);
+ redir_hpane.add (*_active_view);
redir_hpane.show_all();
} else if ((plugin_insert = boost::dynamic_pointer_cast<PluginInsert> (proc)) != 0) {
plugin_ui->start_updating (0);
_active_view = plugin_ui;
- redir_hpane.pack2 (*_active_view);
+ redir_hpane.add (*_active_view);
redir_hpane.show_all();
} else if ((port_insert = boost::dynamic_pointer_cast<PortInsert> (proc)) != 0) {
port_insert->DropReferences.connect (_processor_going_away_connection, invalidator (*this), boost::bind (&RouteParams_UI::processor_going_away, this, boost::weak_ptr<Processor> (proc)), gui_context());
_active_view = portinsert_ui;
- redir_hpane.pack2 (*_active_view);
+ redir_hpane.add (*_active_view);
portinsert_ui->redisplay();
redir_hpane.show_all();
}
void
RouteParams_UI::start_updating ()
{
- update_connection = ARDOUR_UI::instance()->RapidScreenUpdate.connect
+ update_connection = Timers::rapid_connect
(sigc::mem_fun(*this, &RouteParams_UI::update_views));
}
projects / ardour.git / blobdiff