#include <ardour/session.h>
#include "ardour_ui.h"
-#include "mixer_ui.h"
-#include "meter_bridge.h"
#include "connection_editor.h"
-#include "public_editor.h"
-#include "option_editor.h"
#include "location_ui.h"
+#include "mixer_ui.h"
+#include "option_editor.h"
+#include "public_editor.h"
#include "route_params_ui.h"
-#include "library_ui.h"
+#include "sfdb_ui.h"
#include "i18n.h"
{
session = s;
- session->HaltOnXrun.connect (slot (*this, &ARDOUR_UI::halt_on_xrun_message));
+ session->HaltOnXrun.connect (mem_fun(*this, &ARDOUR_UI::halt_on_xrun_message));
/* sensitize menu bar options that are now valid */
/* </CMT Additions> */
- if (session->n_diskstreams()) {
- // meter_bridge_dialog_check->set_sensitive (true);
- } else {
- session->DiskStreamAdded.connect (slot (*this, &ARDOUR_UI::diskstream_added));
+ if (session->n_diskstreams() == 0) {
+ session->DiskStreamAdded.connect (mem_fun(*this, &ARDOUR_UI::diskstream_added));
}
if (connection_editor) {
}
- Blink.connect (slot (*this, &ARDOUR_UI::transport_rec_enable_blink));
- Blink.connect (slot (*this, &ARDOUR_UI::solo_blink));
- Blink.connect (slot (*this, &ARDOUR_UI::audition_blink));
+ Blink.connect (mem_fun(*this, &ARDOUR_UI::transport_rec_enable_blink));
+ Blink.connect (mem_fun(*this, &ARDOUR_UI::solo_blink));
+ Blink.connect (mem_fun(*this, &ARDOUR_UI::audition_blink));
/* these are all need to be handled in an RT-safe and MT way, so don't
do any GUI work, just queue it for handling by the GUI thread.
*/
- session->TransportStateChange.connect (slot (*this, &ARDOUR_UI::queue_transport_change));
- session->ControlChanged.connect (slot (*this, &ARDOUR_UI::queue_map_control_change));
+ session->TransportStateChange.connect (mem_fun(*this, &ARDOUR_UI::queue_transport_change));
+ session->ControlChanged.connect (mem_fun(*this, &ARDOUR_UI::queue_map_control_change));
/* alert the user to these things happening */
- session->AuditionActive.connect (slot (*this, &ARDOUR_UI::auditioning_changed));
- session->SoloActive.connect (slot (*this, &ARDOUR_UI::soloing_changed));
+ session->AuditionActive.connect (mem_fun(*this, &ARDOUR_UI::auditioning_changed));
+ session->SoloActive.connect (mem_fun(*this, &ARDOUR_UI::soloing_changed));
solo_alert_button.set_active (session->soloing());
start_blinking ();
if (editor) {
- editor->window().realize();
+ editor->present();
}
transport_stopped ();
- second_connection = Main::timeout.connect (slot (*this, &ARDOUR_UI::every_second), 1000);
- point_one_second_connection = Main::timeout.connect (slot (*this, &ARDOUR_UI::every_point_one_seconds), 100);
- point_zero_one_second_connection = Main::timeout.connect (slot (*this, &ARDOUR_UI::every_point_zero_one_seconds), 40);
+ second_connection = Glib::signal_timeout().connect (mem_fun(*this, &ARDOUR_UI::every_second), 1000);
+ point_one_second_connection = Glib::signal_timeout().connect (mem_fun(*this, &ARDOUR_UI::every_point_one_seconds), 100);
+ point_zero_one_second_connection = Glib::signal_timeout().connect (mem_fun(*this, &ARDOUR_UI::every_point_zero_one_seconds), 40);
}
int
add_track_item->set_sensitive (false);
export_item->set_sensitive (false);
close_item->set_sensitive (false);
- // meter_bridge_dialog_check->set_sensitive (false);
connection_editor_check->set_sensitive (false);
locations_dialog_check->set_sensitive (false);
- // meter_bridge_dialog_check->set_active(false);
connection_editor_check->set_active(false);
locations_dialog_check->set_active(false);
route_params_check->set_sensitive (false);
return 0;
}
-int
-ARDOUR_UI::create_meter_bridge ()
-{
- if (meter_bridge == 0) {
- meter_bridge = new MeterBridge ();
- meter_bridge->Hiding.connect (slot (*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 ()
{
if (connection_editor == 0) {
- connection_editor = new ConnectionEditor ();
- connection_editor->Hiding.connect (slot (*this, &ARDOUR_UI::connection_editor_hiding));
+ // GTK2FIX
+ // connection_editor = new ConnectionEditor ();
+ // connection_editor->signal_unmap().connect (mem_fun(*this, &ARDOUR_UI::connection_editor_hiding));
}
if (session) {
- connection_editor->set_session (session);
+ // connection_editor->set_session (session);
}
return 0;
return;
}
+ //GTK2FIX
+#if 0
+
if (connection_editor->within_hiding()) {
return;
}
} else {
connection_editor->hide_all();
}
+#endif
}
void
ARDOUR_UI::connection_editor_hiding()
{
- connection_editor_check->set_active(false);
+ //GTK2FIX
+ // connection_editor_check->set_active(false);
}
void
void
ARDOUR_UI::toggle_big_clock_window ()
{
- if (big_clock_window->within_hiding()) {
- return;
- }
-
if (big_clock_window->is_visible()) {
- big_clock_window->hide_all ();
+ big_clock_window->hide ();
} else {
- big_clock_window->show_all ();
+ big_clock_window->present ();
}
}
{
if (option_editor == 0) {
option_editor = new OptionEditor (*this, *editor, *mixer);
- option_editor->Hiding.connect(slot(*this, &ARDOUR_UI::option_hiding));
+ option_editor->signal_unmap().connect(mem_fun(*this, &ARDOUR_UI::option_hiding));
option_editor->set_session (session);
} else if (option_editor->within_hiding()) {
return;
}
if (option_editor->is_visible()) {
- option_editor->hide_all ();
+ option_editor->hide ();
} else {
- option_editor->show_all ();
+ option_editor->present ();
}
}
toggle_some_session_state (auto_input_button,
&Session::get_auto_input,
&Session::set_auto_input);
-
- meter_bridge->clear_all_meters ();
-}
-
-void
-ARDOUR_UI::toggle_metering ()
-{
-#if 0
- if (global_meter_button.get_active()) {
- meter_bridge->toggle_metering ();
- }
-#endif
}
int
if (location_ui == 0) {
location_ui = new LocationUI ();
location_ui->set_session (session);
- location_ui->Hiding.connect (slot (*this, &ARDOUR_UI::location_ui_hiding));
+ location_ui->signal_unmap().connect (mem_fun(*this, &ARDOUR_UI::location_ui_hiding));
}
return 0;
}
}
if (location_ui->is_visible()) {
- location_ui->hide_all();
+ location_ui->hide();
} else {
- location_ui->show_all();
+ location_ui->present();
}
}
if (route_params == 0) {
route_params = new RouteParams_UI (*engine);
route_params->set_session (session);
- route_params->Hiding.connect (slot (*this, &ARDOUR_UI::route_params_hiding));
+ route_params->signal_unmap().connect (mem_fun(*this, &ARDOUR_UI::route_params_hiding));
}
return 0;
}
}
if (route_params->is_visible ()) {
- route_params->hide_all ();
+ route_params->hide ();
} else {
- route_params->show_all ();
+ route_params->present ();
}
}
route_params_check->set_active (false);
}
-SoundFileSelector&
-ARDOUR_UI::get_sfdb_window ()
-{
- if (sfdb_window == 0) {
- sfdb_window = new SoundFileSelector ();
- sfdb_window->Hiding.connect (slot (*this, &ARDOUR_UI::sfdb_hiding));
- sfdb_window->hide_all ();
- }
-
- return *sfdb_window;
-}
-
void
-ARDOUR_UI::toggle_sfdb_window ()
+ARDOUR_UI::toggle_sound_file_browser ()
{
- get_sfdb_window ();
+ if (sfdb_check->get_active()) {
+ SoundFileBrowser sfdb(_("Sound File Browser"));
- if (sfdb_window->within_hiding()) {
- return;
- }
-
- if (sfdb_window->is_visible ()) {
- sfdb_window->hide_all ();
- } else {
- sfdb_window->show_all ();
- sfdb_window->hide_import_stuff();
+ sfdb_check->signal_toggled().connect (bind (mem_fun (sfdb, &Gtk::Dialog::response), Gtk::RESPONSE_CANCEL));
+ sfdb.run();
+ sfdb_check->set_active(false);
}
}
-void
-ARDOUR_UI::sfdb_hiding ()
-{
- sfdb_check->set_active (false);
-}
projects / ardour.git / blobdiff