From 8adae13ad3615c0e63129fa96d72102dae91b882 Mon Sep 17 00:00:00 2001 From: Taybin Rutkin Date: Tue, 19 Dec 2006 14:44:10 +0000 Subject: [PATCH] Removed SoundFileBrowser from Windows menu. FFT_ANALYSIS defaults to YES. git-svn-id: svn://localhost/ardour2/trunk@1229 d708f5d6-7413-0410-9779-e7cbd77b26cf --- SConstruct | 2 +- gtk2_ardour/ardour.bindings | 4 ---- gtk2_ardour/ardour.menus | 1 - gtk2_ardour/ardour_ui.cc | 1 - gtk2_ardour/ardour_ui.h | 6 ------ gtk2_ardour/ardour_ui_dialogs.cc | 34 -------------------------------- gtk2_ardour/ardour_ui_ed.cc | 1 - gtk2_ardour/editor_ops.cc | 1 - 8 files changed, 1 insertion(+), 49 deletions(-) diff --git a/SConstruct b/SConstruct index ff3ab2e961..497b2b84e1 100644 --- a/SConstruct +++ b/SConstruct @@ -34,7 +34,7 @@ opts.AddOptions( EnumOption('DIST_TARGET', 'Build target for cross compiling packagers', 'auto', allowed_values=('auto', 'i386', 'i686', 'x86_64', 'powerpc', 'tiger', 'panther', 'none' ), ignorecase=2), BoolOption('DMALLOC', 'Compile and link using the dmalloc library', 0), BoolOption('EXTRA_WARN', 'Compile with -Wextra, -ansi, and -pedantic. Might break compilation. For pedants', 0), - BoolOption('FFT_ANALYSIS', 'Include FFT analysis window', 0), + BoolOption('FFT_ANALYSIS', 'Include FFT analysis window', 1), BoolOption('FPU_OPTIMIZATION', 'Build runtime checked assembler code', 1), BoolOption('LIBLO', 'Compile with support for liblo library', 1), BoolOption('NLS', 'Set to turn on i18n support', 1), diff --git a/gtk2_ardour/ardour.bindings b/gtk2_ardour/ardour.bindings index eb1dc87f6f..86f50e139f 100644 --- a/gtk2_ardour/ardour.bindings +++ b/gtk2_ardour/ardour.bindings @@ -121,7 +121,6 @@ ; (gtk_accel_path "/Editor/EditSelectRegionOptions" "") (gtk_accel_path "/Editor/crop" "c") ; (gtk_accel_path "/redirectmenu/newsend" "") -; (gtk_accel_path "/Editor/ToggleGeneric MIDISurfaceSubMenu" "") ; (gtk_accel_path "/Editor/MeterFalloff" "") ; (gtk_accel_path "/RegionList/rlRemove" "") (gtk_accel_path "/Transport/GotoStart" "Home") @@ -213,7 +212,6 @@ ; (gtk_accel_path "/Editor/Crossfades" "") ; (gtk_accel_path "/Editor/PullupPlus4" "") (gtk_accel_path "/Editor/add-location-from-playhead" "KP_Enter") -(gtk_accel_path "/Common/ToggleSoundFileBrowser" "f") (gtk_accel_path "/Editor/edit-cursor-to-previous-region-end" "bracketleft") ; (gtk_accel_path "/Main/MeteringHoldTime" "") ; (gtk_accel_path "/Editor/PullupPlus1" "") @@ -278,7 +276,6 @@ ; (gtk_accel_path "/Editor/Subframes80" "") ; (gtk_accel_path "/options/FileHeaderFormatCAF" "") (gtk_accel_path "/Common/ToggleLocations" "l") -; (gtk_accel_path "/Editor/ToggleGeneric MIDISurface" "") (gtk_accel_path "/Editor/editor-delete" "Delete") ; (gtk_accel_path "/JACK/JACKLatency256" "") (gtk_accel_path "/Editor/select-all-between-cursors" "u") @@ -301,7 +298,6 @@ ; (gtk_accel_path "/Snap/snap-to-region-sync" "") (gtk_accel_path "/Editor/edit-cursor-to-previous-region-sync" "apostrophe") ; (gtk_accel_path "/redirectmenu/clear" "") -; (gtk_accel_path "/Editor/ToggleGeneric MIDISurfaceFeedback" "") ; (gtk_accel_path "/Editor/PullupPlus4Minus1" "") ; (gtk_accel_path "/JACK/JACKLatency512" "") (gtk_accel_path "/Editor/edit-cursor-to-next-region-end" "bracketright") diff --git a/gtk2_ardour/ardour.menus b/gtk2_ardour/ardour.menus index b74174c157..00188ff54f 100644 --- a/gtk2_ardour/ardour.menus +++ b/gtk2_ardour/ardour.menus @@ -230,7 +230,6 @@ - diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index 4680514771..39dd6ac156 100644 --- a/gtk2_ardour/ardour_ui.cc +++ b/gtk2_ardour/ardour_ui.cc @@ -156,7 +156,6 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[], string rcfile) route_params = 0; option_editor = 0; location_ui = 0; - sfdb = 0; open_session_selector = 0; have_configure_timeout = false; have_disk_overrun_displayed = false; diff --git a/gtk2_ardour/ardour_ui.h b/gtk2_ardour/ardour_ui.h index d59fbd476f..fb8d87f05d 100644 --- a/gtk2_ardour/ardour_ui.h +++ b/gtk2_ardour/ardour_ui.h @@ -70,7 +70,6 @@ class OptionEditor; class Mixer_UI; class ConnectionEditor; class RouteParams_UI; -class SoundFileBrowser; class About; class AddRouteDialog; class NewSessionDialog; @@ -572,11 +571,6 @@ class ARDOUR_UI : public Gtkmm2ext::UI /* route dialog */ AddRouteDialog *add_route_dialog; - - /* SoundFile Browser */ - SoundFileBrowser *sfdb; - void toggle_sound_file_browser (); - int create_sound_file_browser (); /* Keyboard Handling */ diff --git a/gtk2_ardour/ardour_ui_dialogs.cc b/gtk2_ardour/ardour_ui_dialogs.cc index e467b2e232..a9a61176a9 100644 --- a/gtk2_ardour/ardour_ui_dialogs.cc +++ b/gtk2_ardour/ardour_ui_dialogs.cc @@ -93,10 +93,6 @@ ARDOUR_UI::connect_to_session (Session *s) option_editor->set_session (s); } - if (sfdb) { - sfdb->set_session (s); - } - setup_session_options (); Blink.connect (mem_fun(*this, &ARDOUR_UI::transport_rec_enable_blink)); @@ -346,36 +342,6 @@ ARDOUR_UI::toggle_route_params_window () } } -int -ARDOUR_UI::create_sound_file_browser () -{ - if (sfdb == 0) { - sfdb = new SoundFileBrowser (_("Sound File Browser"), session); - sfdb->signal_unmap().connect (sigc::bind(sigc::ptr_fun(&ActionManager::uncheck_toggleaction), X_("/Common/ToggleSoundFileBrowser"))); - } - return 0; -} - -void -ARDOUR_UI::toggle_sound_file_browser () -{ - if (create_sound_file_browser()) { - return; - } - - RefPtr act = ActionManager::get_action (X_("Common"), X_("ToggleSoundFileBrowser")); - if (act) { - RefPtr tact = RefPtr::cast_dynamic(act); - - if (tact->get_active()) { - sfdb->show_all(); - sfdb->present(); - } else { - sfdb->hide (); - } - } -} - void ARDOUR_UI::handle_locations_change (Location* ignored) { diff --git a/gtk2_ardour/ardour_ui_ed.cc b/gtk2_ardour/ardour_ui_ed.cc index 33307e61ec..47d035b54e 100644 --- a/gtk2_ardour/ardour_ui_ed.cc +++ b/gtk2_ardour/ardour_ui_ed.cc @@ -189,7 +189,6 @@ ARDOUR_UI::install_actions () ActionManager::register_action (common_actions, X_("goto-editor"), _("Show Editor"), mem_fun(*this, &ARDOUR_UI::goto_editor_window)); ActionManager::register_action (common_actions, X_("goto-mixer"), _("Show Mixer"), mem_fun(*this, &ARDOUR_UI::goto_mixer_window)); - ActionManager::register_toggle_action (common_actions, X_("ToggleSoundFileBrowser"), _("Sound File Browser"), mem_fun(*this, &ARDOUR_UI::toggle_sound_file_browser)); ActionManager::register_toggle_action (common_actions, X_("ToggleOptionsEditor"), _("Options Editor"), mem_fun(*this, &ARDOUR_UI::toggle_options_window)); act = ActionManager::register_toggle_action (common_actions, X_("ToggleInspector"), _("Track/Bus Inspector"), mem_fun(*this, &ARDOUR_UI::toggle_route_params_window)); ActionManager::session_sensitive_actions.push_back (act); diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc index c8c11d59c1..ddcf02911a 100644 --- a/gtk2_ardour/editor_ops.cc +++ b/gtk2_ardour/editor_ops.cc @@ -57,7 +57,6 @@ #include "rgb_macros.h" #include "selection_templates.h" #include "selection.h" -#include "sfdb_ui.h" #include "editing.h" #include "gtk-custom-hruler.h" #include "gui_thread.h"