$Id$
*/
-#include <gtkmmext/utils.h>
+#include <gtkmm2ext/utils.h>
#include <ardour/audioengine.h>
#include "editor.h"
#include "ardour_ui.h"
#include "selection.h"
#include "audio_time_axis.h"
+#include "actions.h"
#include "i18n.h"
void
Editor::editor_mixer_button_toggled ()
{
- show_editor_mixer (editor_mixer_button.get_active());
+ Glib::RefPtr<Gtk::Action> act = ActionManager::get_action (X_("Editor"), X_("show-editor-mixer"));
+ if (act) {
+ Glib::RefPtr<Gtk::ToggleAction> tact = Glib::RefPtr<Gtk::ToggleAction>::cast_dynamic(act);
+ show_editor_mixer (tact->get_active());
+ }
}
void
*session,
atv->route(), false);
- current_mixer_strip->GoingAway.connect (slot (*this, &Editor::cms_deleted));
+ current_mixer_strip->GoingAway.connect (mem_fun(*this, &Editor::cms_deleted));
break;
}
}
current_mixer_strip = new MixerStrip (*ARDOUR_UI::instance()->the_mixer(),
*session,
atv->route(), false);
- current_mixer_strip->GoingAway.connect (slot (*this, &Editor::cms_deleted));
+ current_mixer_strip->GoingAway.connect (mem_fun(*this, &Editor::cms_deleted));
break;
}
}
}
if (current_mixer_strip->get_parent() == 0) {
-
current_mixer_strip->set_embedded (true);
- current_mixer_strip->Hiding.connect (slot (*this, &Editor::current_mixer_strip_hidden));
- current_mixer_strip->GoingAway.connect (slot (*this, &Editor::current_mixer_strip_removed));
+ current_mixer_strip->Hiding.connect (mem_fun(*this, &Editor::current_mixer_strip_hidden));
+ current_mixer_strip->GoingAway.connect (mem_fun(*this, &Editor::current_mixer_strip_removed));
current_mixer_strip->set_width (editor_mixer_strip_width);
- current_mixer_strip->show_all ();
- global_hpacker.pack_start (*current_mixer_strip, false, false);
- global_hpacker.reorder_child (*current_mixer_strip, 0);
+ global_hpacker.pack_start (*current_mixer_strip, Gtk::PACK_SHRINK );
+ global_hpacker.reorder_child (*current_mixer_strip, 0);
+
+ current_mixer_strip->show_all ();
}
} else {
if (current_mixer_strip) {
- editor_mixer_strip_width = current_mixer_strip->get_width ();
+ editor_mixer_strip_width = current_mixer_strip->get_width ();
if (current_mixer_strip->get_parent() != 0) {
global_hpacker.remove (*current_mixer_strip);
}
/* might be nothing to do */
- if (¤t_mixer_strip->route() == &at->route()) {
+ if (current_mixer_strip->route() == at->route()) {
return;
}
if (current_mixer_strip->get_parent()) {
show = true;
}
-
delete current_mixer_strip;
current_mixer_strip = 0;
}
current_mixer_strip = new MixerStrip (*ARDOUR_UI::instance()->the_mixer(),
*session,
at->route());
- current_mixer_strip->GoingAway.connect (slot (*this, &Editor::cms_deleted));
+ current_mixer_strip->GoingAway.connect (mem_fun(*this, &Editor::cms_deleted));
if (show) {
show_editor_mixer (true);
if (_follow_playhead) {
- gtk_canvas_item_show (playhead_cursor->canvas_item);
-
+ playhead_cursor->canvas_item.show();
if (frame != last_update_frame) {
if (frame < leftmost_frame || frame > leftmost_frame + current_page_frames()) {
if (frame != last_update_frame) {
if (frame < leftmost_frame || frame > leftmost_frame + current_page_frames()) {
- gtk_canvas_item_hide (playhead_cursor->canvas_item);
+ playhead_cursor->canvas_item.hide();
} else {
playhead_cursor->set_position (frame);
}
}
}
-void
-Editor::update_slower ()
-{
- if (current_mixer_strip) {
- current_mixer_strip->update ();
- }
-}
-
void
Editor::current_mixer_strip_removed ()
{
AudioTimeAxisView* tmp;
if ((tmp = dynamic_cast<AudioTimeAxisView*>(*i)) != 0) {
- if (&(tmp->route()) == &(current_mixer_strip->route())) {
+ if (tmp->route() == current_mixer_strip->route()) {
(*i)->set_selected (false);
break;
}
}
}
- global_hpacker.remove (*current_mixer_strip);
+
+ Glib::RefPtr<Gtk::Action> act = ActionManager::get_action (X_("Editor"), X_("show-editor-mixer"));
+ if (act) {
+ Glib::RefPtr<Gtk::ToggleAction> tact = Glib::RefPtr<Gtk::ToggleAction>::cast_dynamic(act);
+ tact->set_active (false);
+ }
}
void
Editor::session_going_away ()
{
- for (vector<SigC::Connection>::iterator i = session_connections.begin(); i != session_connections.end(); ++i) {
+ for (vector<sigc::connection>::iterator i = session_connections.begin(); i != session_connections.end(); ++i) {
(*i).disconnect ();
}
entered_regionview = 0;
entered_track = 0;
latest_regionview = 0;
- region_list_display_drag_region = 0;
last_update_frame = 0;
drag_info.item = 0;
last_audition_region = 0;
- region_list_button_region = 0;
+ last_canvas_frame = 0;
/* hide all tracks */
/* rip everything out of the list displays */
region_list_clear (); // no clear() method in gtkmm 1.2
- route_list.clear ();
- named_selection_display.clear ();
- edit_group_list.clear ();
+ route_display_model->clear ();
+ named_selection_model->clear ();
+ group_model->clear ();
edit_cursor_clock.set_session (0);
- selection_start_clock.set_session (0);
- selection_end_clock.set_session (0);
zoom_range_clock.set_session (0);
nudge_clock.set_session (0);
current_bbt_points = 0;
}
- if (embed_audio_item) {
- embed_audio_item->set_sensitive (false);
- }
-
- if (import_audio_item) {
- import_audio_item->set_sensitive (false);
- }
-
/* mixer strip will be deleted all by itself
when its route is deleted.
*/