along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- $Id$
*/
#include <algorithm>
#include <gtkmm2ext/gtk_ui.h>
#include <gtkmm2ext/utils.h>
#include <gtkmm2ext/stop_signal.h>
+#include <gtkmm2ext/window_title.h>
-#include <ardour/audioengine.h>
#include <ardour/session.h>
#include <ardour/audio_track.h>
#include <ardour/session_route.h>
using PBD::atoi;
-Mixer_UI::Mixer_UI (AudioEngine& eng)
- : Window (Gtk::WINDOW_TOPLEVEL),
- engine (eng)
+Mixer_UI::Mixer_UI ()
+ : Window (Gtk::WINDOW_TOPLEVEL)
{
_strip_width = Wide;
track_menu = 0;
add (global_vpacker);
set_name ("MixerWindow");
- set_title (_("ardour: mixer"));
+
+ WindowTitle title(Glib::get_application_name());
+ title += _("Mixer");
+ set_title (title.get_string());
+
set_wmclass (X_("ardour_mixer"), "Ardour");
add_accel_group (ActionManager::ui_manager->get_accel_group());
signal_configure_event().connect (mem_fun (*ARDOUR_UI::instance(), &ARDOUR_UI::configure_handler));
_selection.RoutesChanged.connect (mem_fun(*this, &Mixer_UI::follow_strip_selection));
+
+ mix_group_display_button_box->show();
+ mix_group_add_button->show();
+ mix_group_remove_button->show();
+
+ global_hpacker.show();
+ global_vpacker.show();
+ scroller.show();
+ scroller_base.show();
+ scroller_hpacker.show();
+ mixer_scroller_vpacker.show();
+ list_vpacker.show();
+ group_display_button_label.show();
+ group_display_button.show();
+ track_display_scroller.show();
+ group_display_scroller.show();
+ group_display_vbox.show();
+ track_display_frame.show();
+ group_display_frame.show();
+ rhs_pane1.show();
+ strip_packer.show();
+ out_packer.show();
+ list_hpane.show();
+ track_display.show();
+ group_display.show();
}
Mixer_UI::~Mixer_UI ()
void
Mixer_UI::show_window ()
{
- show_all ();
+ present ();
+
+ set_window_pos_and_size ();
/* now reset each strips width so the right widgets are shown */
MixerStrip* ms;
for (ri = rows.begin(); ri != rows.end(); ++ri) {
ms = (*ri)[track_columns.strip];
- ms->set_width (ms->get_width());
+ ms->set_width (ms->get_width(), ms->width_owner());
}
_visible = true;
}
bool
Mixer_UI::hide_window (GdkEventAny *ev)
{
+ get_window_pos_and_size ();
+
_visible = false;
return just_hide_it(ev, static_cast<Gtk::Window *>(this));
}
for (Session::RouteList::iterator x = routes.begin(); x != routes.end(); ++x) {
boost::shared_ptr<Route> route = (*x);
- if (route->hidden()) {
+ if (route->is_hidden()) {
return;
}
strip = new MixerStrip (*this, *session, route);
strips.push_back (strip);
- strip->set_width (_strip_width);
+ if (strip->width_owner() != strip) {
+ strip->set_width (_strip_width, this);
+ }
+
show_strip (strip);
no_track_list_redisplay = true;
TreeModel::Row row = *(track_model->append());
row[track_columns.text] = route->name();
- row[track_columns.visible] = true;
+ row[track_columns.visible] = strip->marked_for_display();
row[track_columns.route] = route;
row[track_columns.strip] = strip;
no_track_list_redisplay = false;
redisplay_track_list ();
- route->name_changed.connect (bind (mem_fun(*this, &Mixer_UI::strip_name_changed), strip));
+ route->NameChanged.connect (bind (mem_fun(*this, &Mixer_UI::strip_name_changed), strip));
strip->GoingAway.connect (bind (mem_fun(*this, &Mixer_UI::remove_strip), strip));
strip->signal_button_release_event().connect (bind (mem_fun(*this, &Mixer_UI::strip_button_release_event), strip));
XMLNode* node = ARDOUR_UI::instance()->mixer_settings();
set_state (*node);
- string wintitle = _("ardour: mixer: ");
- wintitle += session->name();
- set_title (wintitle);
+ WindowTitle title(session->name());
+ title += _("Mixer");
+ title += Glib::get_application_name();
+
+ set_title (title.get_string());
initial_track_display ();
ENSURE_GUI_THREAD(mem_fun(*this, &Mixer_UI::disconnect_from_session));
group_model->clear ();
- set_title (_("ardour: mixer"));
+ _selection.clear ();
+
+ WindowTitle title(Glib::get_application_name());
+ title += _("Mixer");
+ set_title (title.get_string());
+
stop_updating ();
}
continue;
}
- if (strip->route()->master() || strip->route()->control()) {
+ if (strip->route()->is_master() || strip->route()->is_control()) {
continue;
}
continue;
}
- if (strip->route()->master() || strip->route()->control()) {
+ if (strip->route()->is_master() || strip->route()->is_control()) {
continue;
}
- AudioTrack* at = strip->audio_track();
+ boost::shared_ptr<AudioTrack> at = strip->audio_track();
switch (tracks) {
case 0:
void
Mixer_UI::track_list_change (const Gtk::TreeModel::Path& path,const Gtk::TreeModel::iterator& iter)
{
+ session->set_remote_control_ids();
redisplay_track_list ();
}
void
Mixer_UI::track_list_delete (const Gtk::TreeModel::Path& path)
{
+ session->set_remote_control_ids();
redisplay_track_list ();
}
if (strip->packed()) {
- if (strip->route()->master() || strip->route()->control()) {
+ if (strip->route()->is_master() || strip->route()->is_control()) {
out_packer.reorder_child (*strip, -1);
} else {
strip_packer.reorder_child (*strip, -1); /* put at end */
} else {
- if (strip->route()->master() || strip->route()->control()) {
+ if (strip->route()->is_master() || strip->route()->is_control()) {
out_packer.pack_start (*strip, false, false);
} else {
strip_packer.pack_start (*strip, false, false);
}
strip->set_packed (true);
- strip->show_all ();
+ //strip->show();
}
} else {
- if (strip->route()->master() || strip->route()->control()) {
+ if (strip->route()->is_master() || strip->route()->is_control()) {
/* do nothing, these cannot be hidden */
} else {
- strip_packer.remove (*strip);
- strip->set_packed (false);
+ if (strip->packed()) {
+ strip_packer.remove (*strip);
+ strip->set_packed (false);
+ }
}
}
}
MixerStrip* strip = (*iter)[track_columns.strip];
if (strip) {
- if (!strip->route()->master() && !strip->route()->control()) {
+ if (!strip->route()->is_master() && !strip->route()->is_control()) {
bool visible = (*iter)[track_columns.visible];
(*iter)[track_columns.visible] = !visible;
}
}
void
-Mixer_UI::strip_name_changed (void* src, MixerStrip* mx)
+Mixer_UI::strip_name_changed (MixerStrip* mx)
{
- ENSURE_GUI_THREAD(bind (mem_fun(*this, &Mixer_UI::strip_name_changed), src, mx));
+ ENSURE_GUI_THREAD(bind (mem_fun(*this, &Mixer_UI::strip_name_changed), mx));
TreeModel::Children rows = track_model->children();
TreeModel::Children::iterator i;
}
ENSURE_GUI_THREAD(bind (mem_fun(*this, &Mixer_UI::group_flags_changed), src, group));
+
+ /* force an update of any mixer strips that are using this group,
+ otherwise mix group names don't change in mixer strips
+ */
+
+ for (list<MixerStrip *>::iterator i = strips.begin(); i != strips.end(); ++i) {
+ if ((*i)->mix_group() == group) {
+ (*i)->mix_group_changed(0);
+ }
+ }
TreeModel::iterator i;
TreeModel::Children rows = group_model->children();
using namespace Menu_Helpers;
if (Keyboard::is_context_menu_event (ev)) {
- ARDOUR_UI::instance()->add_route();
+ ARDOUR_UI::instance()->add_route (this);
return true;
}
_strip_width = w;
for (list<MixerStrip*>::iterator i = strips.begin(); i != strips.end(); ++i) {
- (*i)->set_width (w);
+ (*i)->set_width (w, this);
}
}
+void
+Mixer_UI::set_window_pos_and_size ()
+{
+ resize (m_width, m_height);
+ move (m_root_x, m_root_y);
+}
+
+ void
+Mixer_UI::get_window_pos_and_size ()
+{
+ get_position(m_root_x, m_root_y);
+ get_size(m_width, m_height);
+}
int
Mixer_UI::set_state (const XMLNode& node)
{
const XMLProperty* prop;
XMLNode* geometry;
- Gdk::Geometry g;
- int x, y, xoff, yoff;
if ((geometry = find_named_node (node, "geometry")) == 0) {
- g.base_width = default_width;
- g.base_height = default_height;
- x = 1;
- y = 1;
- xoff = 0;
- yoff = 21;
+ m_width = default_width;
+ m_height = default_height;
+ m_root_x = 1;
+ m_root_y = 1;
} else {
- g.base_width = atoi(geometry->property("x_size")->value().c_str());
- g.base_height = atoi(geometry->property("y_size")->value().c_str());
- x = atoi(geometry->property("x_pos")->value().c_str());
- y = atoi(geometry->property("y_pos")->value().c_str());
- xoff = atoi(geometry->property("x_off")->value().c_str());
- yoff = atoi(geometry->property("y_off")->value().c_str());
+ m_width = atoi(geometry->property("x_size")->value().c_str());
+ m_height = atoi(geometry->property("y_size")->value().c_str());
+ m_root_x = atoi(geometry->property("x_pos")->value().c_str());
+ m_root_y = atoi(geometry->property("y_pos")->value().c_str());
}
- set_geometry_hints (global_vpacker, g, Gdk::HINT_BASE_SIZE);
- set_default_size(g.base_width, g.base_height);
- move (x, y);
+ set_window_pos_and_size ();
if ((prop = node.property ("narrow-strips"))) {
if (prop->value() == "yes") {
if (is_realized()) {
Glib::RefPtr<Gdk::Window> win = get_window();
-
- int x, y, xoff, yoff, width, height;
- win->get_root_origin(x, y);
- win->get_position(xoff, yoff);
- win->get_size(width, height);
+
+ get_window_pos_and_size ();
XMLNode* geometry = new XMLNode ("geometry");
char buf[32];
- snprintf(buf, sizeof(buf), "%d", width);
+ snprintf(buf, sizeof(buf), "%d", m_width);
geometry->add_property(X_("x_size"), string(buf));
- snprintf(buf, sizeof(buf), "%d", height);
+ snprintf(buf, sizeof(buf), "%d", m_height);
geometry->add_property(X_("y_size"), string(buf));
- snprintf(buf, sizeof(buf), "%d", x);
+ snprintf(buf, sizeof(buf), "%d", m_root_x);
geometry->add_property(X_("x_pos"), string(buf));
- snprintf(buf, sizeof(buf), "%d", y);
+ snprintf(buf, sizeof(buf), "%d", m_root_y);
geometry->add_property(X_("y_pos"), string(buf));
- snprintf(buf, sizeof(buf), "%d", xoff);
+
+ // written only for compatibility, they are not used.
+ snprintf(buf, sizeof(buf), "%d", 0);
geometry->add_property(X_("x_off"), string(buf));
- snprintf(buf, sizeof(buf), "%d", yoff);
+ snprintf(buf, sizeof(buf), "%d", 0);
geometry->add_property(X_("y_off"), string(buf));
snprintf(buf,sizeof(buf), "%d",gtk_paned_get_position (static_cast<Paned*>(&rhs_pane1)->gobj()));
projects / ardour.git / blobdiff