allanger/ardour
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Activity

remove the entire idea of a tabbable for VCA master faders

Browse Source 
Conflicts:
	gtk2_ardour/master_faders.cc
This commit is contained in:
Paul Davis
2016-01-25 15:56:59 -05:00
parent f4032599f2
commit 99b0712be4
6 changed files with 1 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gtk2_ardour/ardour_ui.cc
View File

@@ -255,7 +255,6 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[], const char* localedir)
, main_window_visibility (0)
, editor (0)
, mixer (0)
, masters (0)
, nsm (0)
, _was_dirty (false)
, _mixer_on_top (false)
@@ -312,7 +311,6 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[], const char* localedir)
, editor_visibility_button (S_("Window|Editor"))
, mixer_visibility_button (S_("Window|Mixer"))
, prefs_visibility_button (S_("Window|Preferences"))
, masters_visibility_button (S_("Windows|Masters"))
{
Gtkmm2ext::init (localedir);

4
gtk2_ardour/ardour_ui.h
View File

@@ -119,7 +119,6 @@ class ButtonJoiner;
class ConnectionEditor;
class DuplicateRouteDialog;
class MainClock;
class MasterFaders;
class Mixer_UI;
class ArdourPrompter;
class PublicEditor;
@@ -205,7 +204,6 @@ public:
PublicEditor& the_editor() { return *editor;}
Mixer_UI* the_mixer() { return mixer; }
MasterFaders* the_masters() { return masters; }
void new_midi_tracer_window ();
void toggle_editing_space();
@@ -386,7 +384,6 @@ private:
Gtk::Notebook _tabs;
PublicEditor* editor;
Mixer_UI* mixer;
MasterFaders* masters;
Gtk::Tooltips _tooltips;
NSM_Client* nsm;
bool _was_dirty;
@@ -857,7 +854,6 @@ private:
ArdourButton editor_visibility_button;
ArdourButton mixer_visibility_button;
ArdourButton prefs_visibility_button;
ArdourButton masters_visibility_button;
bool key_press_focus_accelerator_handler (Gtk::Window& window, GdkEventKey* ev, Gtkmm2ext::Bindings*);
bool try_gtk_accel_binding (GtkWindow* win, GdkEventKey* ev, bool translate, GdkModifierType modifier);

7
gtk2_ardour/ardour_ui_dependents.cc
View File

@@ -36,7 +36,6 @@
#include "actions.h"
#include "ardour_ui.h"
#include "public_editor.h"
#include "master_faders.h"
#include "meterbridge.h"
#include "luawindow.h"
#include "mixer_ui.h"
@@ -164,8 +163,7 @@ ARDOUR_UI::tab_window_root_drop (GtkNotebook* src,
tabbable = mixer;
} else if (w == GTK_WIDGET(rc_option_editor->contents().gobj())) {
tabbable = rc_option_editor;
} else if (w == GTK_WIDGET(masters->contents().gobj())) {
tabbable = masters;
} else {
return 0;
}
@@ -274,7 +272,6 @@ ARDOUR_UI::setup_windows ()
/* order of addition affects order seen in initial window display */
masters->add_to_notebook (_tabs, _("Masters"));
rc_option_editor->add_to_notebook (_tabs, _("Preferences"));
mixer->add_to_notebook (_tabs, _("Mixer"));
editor->add_to_notebook (_tabs, _("Editor"));
@@ -390,8 +387,6 @@ ARDOUR_UI::setup_windows ()
_tabs.set_current_page (_tabs.page_num (mixer->contents()));
} else if (rc_option_editor && current_tab == "preferences") {
_tabs.set_current_page (_tabs.page_num (rc_option_editor->contents()));
} else if (masters && current_tab == "masters") {
_tabs.set_current_page (_tabs.page_num (masters->contents()));
} else if (editor) {
_tabs.set_current_page (_tabs.page_num (editor->contents()));
}

39
gtk2_ardour/ardour_ui_dialogs.cc
View File

@@ -52,7 +52,6 @@
#include "lua_script_manager.h"
#include "luawindow.h"
#include "main_clock.h"
#include "master_faders.h"
#include "meterbridge.h"
#include "meter_patterns.h"
#include "monitor_section.h"
@@ -551,7 +550,6 @@ ARDOUR_UI::tabs_page_added (Widget*,guint)
editor_visibility_button.drag_source_set (drag_target_entries);
mixer_visibility_button.drag_source_set (drag_target_entries);
prefs_visibility_button.drag_source_set (drag_target_entries);
masters_visibility_button.drag_source_set (drag_target_entries);
editor_visibility_button.drag_source_set_icon (Gtkmm2ext::pixbuf_from_string (editor->name(),
Pango::FontDescription ("Sans 24"),
@@ -565,10 +563,6 @@ ARDOUR_UI::tabs_page_added (Widget*,guint)
Pango::FontDescription ("Sans 24"),
0, 0,
Gdk::Color ("red")));
masters_visibility_button.drag_source_set_icon (Gtkmm2ext::pixbuf_from_string (masters->name(),
Pango::FontDescription ("Sans 24"),
0, 0,
Gdk::Color ("red")));
}
}
@@ -579,7 +573,6 @@ ARDOUR_UI::tabs_page_removed (Widget*, guint)
editor_visibility_button.drag_source_unset ();
mixer_visibility_button.drag_source_unset ();
prefs_visibility_button.drag_source_unset ();
masters_visibility_button.drag_source_unset ();
}
}
@@ -608,10 +601,6 @@ ARDOUR_UI::tabs_switch (GtkNotebookPage*, guint page)
prefs_visibility_button.set_active_state (Gtkmm2ext::Off);
}
if (masters && (masters->tabbed() || masters->tabbed_by_default())) {
masters_visibility_button.set_active_state (Gtkmm2ext::Off);
}
} else if (page == (guint) _tabs.page_num (rc_option_editor->contents())) {
if (editor && (editor->tabbed() || editor->tabbed_by_default())) {
@@ -623,26 +612,6 @@ ARDOUR_UI::tabs_switch (GtkNotebookPage*, guint page)
}
prefs_visibility_button.set_active_state (Gtkmm2ext::ImplicitActive);
if (masters && (masters->tabbed() || masters->tabbed_by_default())) {
masters_visibility_button.set_active_state (Gtkmm2ext::Off);
}
} else if (page == (guint) _tabs.page_num (masters->contents())) {
if (editor && (editor->tabbed() || editor->tabbed_by_default())) {
editor_visibility_button.set_active_state (Gtkmm2ext::Off);
}
if (mixer && (mixer->tabbed() || mixer->tabbed_by_default())) {
mixer_visibility_button.set_active_state (Gtkmm2ext::Off);
}
if (rc_option_editor && (rc_option_editor->tabbed() || rc_option_editor->tabbed_by_default())) {
prefs_visibility_button.set_active_state (Gtkmm2ext::Off);
}
masters_visibility_button.set_active_state (Gtkmm2ext::ImplicitActive);
}
}
@@ -731,22 +700,14 @@ ARDOUR_UI::tabbable_state_change (Tabbable& t)
vis_button = &editor_visibility_button;
other_vis_buttons.push_back (&mixer_visibility_button);
other_vis_buttons.push_back (&prefs_visibility_button);
other_vis_buttons.push_back (&masters_visibility_button);
} else if (&t == mixer) {
vis_button = &mixer_visibility_button;
other_vis_buttons.push_back (&editor_visibility_button);
other_vis_buttons.push_back (&prefs_visibility_button);
other_vis_buttons.push_back (&masters_visibility_button);
} else if (&t == rc_option_editor) {
vis_button = &prefs_visibility_button;
other_vis_buttons.push_back (&editor_visibility_button);
other_vis_buttons.push_back (&masters_visibility_button);
other_vis_buttons.push_back (&mixer_visibility_button);
} else if (&t == masters) {
vis_button = &masters_visibility_button;
other_vis_buttons.push_back (&editor_visibility_button);
other_vis_buttons.push_back (&mixer_visibility_button);
other_vis_buttons.push_back (&prefs_visibility_button);
}
if (!vis_button) {

7
gtk2_ardour/ardour_ui_ed.cc
View File

@@ -46,7 +46,6 @@
#include "public_editor.h"
#include "audio_clock.h"
#include "keyboard.h"
#include "master_faders.h"
#include "monitor_section.h"
#include "engine_dialog.h"
#include "editor.h"
@@ -250,22 +249,18 @@ ARDOUR_UI::install_actions ()
global_actions.register_action (common_actions, X_("show-mixer"), _("Show"), sigc::bind (sigc::mem_fun (*this, &ARDOUR_UI::show_tabbable), mixer));
global_actions.register_action (common_actions, X_("show-preferences"), _("Show"), sigc::bind (sigc::mem_fun (*this, &ARDOUR_UI::show_tabbable), rc_option_editor));
global_actions.register_action (common_actions, X_("menu-show-preferences"), _("Preferences"), sigc::bind (sigc::mem_fun (*this, &ARDOUR_UI::show_tabbable), rc_option_editor));
global_actions.register_action (common_actions, X_("show-masters"), _("Show"), sigc::bind (sigc::mem_fun (*this, &ARDOUR_UI::show_tabbable), masters));
global_actions.register_action (common_actions, X_("hide-editor"), _("Hide"), sigc::bind (sigc::mem_fun (*this, &ARDOUR_UI::hide_tabbable), editor));
global_actions.register_action (common_actions, X_("hide-mixer"), _("Hide"), sigc::bind (sigc::mem_fun (*this, &ARDOUR_UI::hide_tabbable), mixer));
global_actions.register_action (common_actions, X_("hide-preferences"), _("Hide"), sigc::bind (sigc::mem_fun (*this, &ARDOUR_UI::hide_tabbable), rc_option_editor));
global_actions.register_action (common_actions, X_("hide-masters"), _("Hide"), sigc::bind (sigc::mem_fun (*this, &ARDOUR_UI::hide_tabbable), masters));
global_actions.register_action (common_actions, X_("attach-editor"), _("Attach"), sigc::bind (sigc::mem_fun (*this, &ARDOUR_UI::attach_tabbable), editor));
global_actions.register_action (common_actions, X_("attach-mixer"), _("Attach"), sigc::bind (sigc::mem_fun (*this, &ARDOUR_UI::attach_tabbable), mixer));
global_actions.register_action (common_actions, X_("attach-preferences"), _("Attach"), sigc::bind (sigc::mem_fun (*this, &ARDOUR_UI::attach_tabbable), rc_option_editor));
global_actions.register_action (common_actions, X_("attach-masters"), _("Attach"), sigc::bind (sigc::mem_fun (*this, &ARDOUR_UI::attach_tabbable), masters));
global_actions.register_action (common_actions, X_("detach-editor"), _("Detach"), sigc::bind (sigc::mem_fun (*this, &ARDOUR_UI::detach_tabbable), editor));
global_actions.register_action (common_actions, X_("detach-mixer"), _("Detach"), sigc::bind (sigc::mem_fun (*this, &ARDOUR_UI::detach_tabbable), mixer));
global_actions.register_action (common_actions, X_("detach-preferences"), _("Detach"), sigc::bind (sigc::mem_fun (*this, &ARDOUR_UI::detach_tabbable), rc_option_editor));
global_actions.register_action (common_actions, X_("detach-masters"), _("Detach"), sigc::bind (sigc::mem_fun (*this, &ARDOUR_UI::detach_tabbable), masters));
/* These "change" actions are not intended to be used inside menus, but
are for the tab/window control buttons, which have somewhat odd
@@ -274,7 +269,6 @@ ARDOUR_UI::install_actions ()
global_actions.register_action (common_actions, X_("change-editor-visibility"), _("Change"), sigc::bind (sigc::mem_fun (*this, &ARDOUR_UI::button_change_tabbable_visibility), editor));
global_actions.register_action (common_actions, X_("change-mixer-visibility"), _("Change"), sigc::bind (sigc::mem_fun (*this, &ARDOUR_UI::button_change_tabbable_visibility), mixer));
global_actions.register_action (common_actions, X_("change-preferences-visibility"), _("Change"), sigc::bind (sigc::mem_fun (*this, &ARDOUR_UI::button_change_tabbable_visibility), rc_option_editor));
global_actions.register_action (common_actions, X_("change-masters-visibility"), _("Change"), sigc::bind (sigc::mem_fun (*this, &ARDOUR_UI::button_change_tabbable_visibility), masters));
/* These "change" actions are not intended to be used inside menus, but
are for the tab/window control key bindings, which have somewhat odd
@@ -283,7 +277,6 @@ ARDOUR_UI::install_actions ()
global_actions.register_action (common_actions, X_("key-change-editor-visibility"), _("Change"), sigc::bind (sigc::mem_fun (*this, &ARDOUR_UI::key_change_tabbable_visibility), editor));
global_actions.register_action (common_actions, X_("key-change-mixer-visibility"), _("Change"), sigc::bind (sigc::mem_fun (*this, &ARDOUR_UI::key_change_tabbable_visibility), mixer));
global_actions.register_action (common_actions, X_("key-change-preferences-visibility"), _("Change"), sigc::bind (sigc::mem_fun (*this, &ARDOUR_UI::key_change_tabbable_visibility), rc_option_editor));
global_actions.register_action (common_actions, X_("key-change-masters-visibility"), _("Change"), sigc::bind (sigc::mem_fun (*this, &ARDOUR_UI::key_change_tabbable_visibility), masters));
global_actions.register_action (common_actions, X_("previous-tab"), _("Previous Tab"), sigc::mem_fun (*this, &ARDOUR_UI::step_up_through_tabs));
global_actions.register_action (common_actions, X_("next-tab"), _("Next Tab"), sigc::mem_fun (*this, &ARDOUR_UI::step_down_through_tabs));

14
gtk2_ardour/ardour_ui_mixer.cc
View File

@@ -27,7 +27,6 @@
#include "actions.h"
#include "ardour_ui.h"
#include "master_faders.h"
#include "mixer_ui.h"
#include "meterbridge.h"
@@ -70,16 +69,3 @@ ARDOUR_UI::create_meterbridge ()
return 0;
}
int
ARDOUR_UI::create_masters ()
{
try {
masters = MasterFaders::instance ();
}
catch (failed_constructor& err) {
return -1;
}
return 0;
}