From: Robin Gareus Date: Mon, 17 Jul 2017 03:18:48 +0000 (+0200) Subject: Remove ArdourPrompter wrapper X-Git-Tag: 5.11~276 X-Git-Url: https://main.carlh.net/gitweb/?p=ardour.git;a=commitdiff_plain;h=1f5ebc54853446a786925941bd014666e75221d2 Remove ArdourPrompter wrapper --- diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index b24fbafb05..00e3129dc0 100644 --- a/gtk2_ardour/ardour_ui.cc +++ b/gtk2_ardour/ardour_ui.cc @@ -78,6 +78,7 @@ #include "gtkmm2ext/window_title.h" #include "widgets/fastmeter.h" +#include "widgets/prompter.h" #include "ardour/ardour.h" #include "ardour/audio_backend.h" @@ -163,7 +164,6 @@ typedef uint64_t microseconds_t; #include "opts.h" #include "pingback.h" #include "processor_box.h" -#include "prompter.h" #include "public_editor.h" #include "rc_option_editor.h" #include "route_time_axis.h" @@ -2886,7 +2886,7 @@ ARDOUR_UI::quick_snapshot_session (bool switch_to_it) bool -ARDOUR_UI::process_snapshot_session_prompter (ArdourPrompter& prompter, bool switch_to_it) +ARDOUR_UI::process_snapshot_session_prompter (Prompter& prompter, bool switch_to_it) { string snapname; @@ -2932,7 +2932,7 @@ ARDOUR_UI::process_snapshot_session_prompter (ArdourPrompter& prompter, bool swi void ARDOUR_UI::snapshot_session (bool switch_to_it) { - ArdourPrompter prompter (true); + Prompter prompter (true); prompter.set_name ("Prompter"); prompter.add_button (Gtk::Stock::SAVE, Gtk::RESPONSE_ACCEPT); @@ -2977,7 +2977,7 @@ ARDOUR_UI::rename_session () return; } - ArdourPrompter prompter (true); + Prompter prompter (true); string name; prompter.set_name ("Prompter"); @@ -3119,7 +3119,7 @@ ARDOUR_UI::transport_rec_enable_blink (bool onoff) } bool -ARDOUR_UI::process_save_template_prompter (ArdourPrompter& prompter) +ARDOUR_UI::process_save_template_prompter (Prompter& prompter) { string name; @@ -3148,7 +3148,7 @@ ARDOUR_UI::process_save_template_prompter (ArdourPrompter& prompter) void ARDOUR_UI::save_template () { - ArdourPrompter prompter (true); + Prompter prompter (true); if (!check_audioengine (_main_window)) { return; diff --git a/gtk2_ardour/ardour_ui.h b/gtk2_ardour/ardour_ui.h index f66f9b467b..42a4f20c79 100644 --- a/gtk2_ardour/ardour_ui.h +++ b/gtk2_ardour/ardour_ui.h @@ -125,7 +125,6 @@ class ConnectionEditor; class DuplicateRouteDialog; class MainClock; class Mixer_UI; -class ArdourPrompter; class PublicEditor; class SaveAsDialog; class SessionDialog; @@ -154,6 +153,7 @@ namespace Gtk { } namespace ArdourWidgets { + class Prompter; class Tabbable; } @@ -652,7 +652,7 @@ private: void open_session (); void open_recent_session (); - bool process_save_template_prompter (ArdourPrompter& prompter); + bool process_save_template_prompter (ArdourWidgets::Prompter& prompter); void save_template (); void manage_templates (); @@ -697,7 +697,7 @@ private: guint32 last_key_press_time; - bool process_snapshot_session_prompter (ArdourPrompter& prompter, bool switch_to_it); + bool process_snapshot_session_prompter (ArdourWidgets::Prompter& prompter, bool switch_to_it); void snapshot_session (bool switch_to_it); void quick_snapshot_session (bool switch_to_it); //does not promtp for name, just makes a timestamped file diff --git a/gtk2_ardour/audio_time_axis.cc b/gtk2_ardour/audio_time_axis.cc index ae3c22b091..72af2f846c 100644 --- a/gtk2_ardour/audio_time_axis.cc +++ b/gtk2_ardour/audio_time_axis.cc @@ -48,7 +48,6 @@ #include "automation_time_axis.h" #include "keyboard.h" #include "playlist_selector.h" -#include "prompter.h" #include "public_editor.h" #include "audio_region_view.h" #include "audio_streamview.h" diff --git a/gtk2_ardour/axis_view.h b/gtk2_ardour/axis_view.h index ac38db86c0..bacaa8410d 100644 --- a/gtk2_ardour/axis_view.h +++ b/gtk2_ardour/axis_view.h @@ -32,7 +32,6 @@ #include "ardour/session_handle.h" #include "gui_object.h" -#include "prompter.h" #include "selectable.h" namespace PBD { diff --git a/gtk2_ardour/editor_markers.cc b/gtk2_ardour/editor_markers.cc index 8723aad488..64018f3f21 100644 --- a/gtk2_ardour/editor_markers.cc +++ b/gtk2_ardour/editor_markers.cc @@ -31,13 +31,14 @@ #include "canvas/item.h" #include "canvas/rectangle.h" +#include "widgets/prompter.h" + #include "editor.h" #include "marker.h" #include "selection.h" #include "editing.h" #include "gui_thread.h" #include "actions.h" -#include "prompter.h" #include "editor_drag.h" #include "pbd/i18n.h" @@ -1612,7 +1613,7 @@ Editor::rename_marker(ArdourMarker *marker) return; } - ArdourPrompter dialog (true); + ArdourWidgets::Prompter dialog (true); string txt; dialog.set_prompt (_("New Name:")); diff --git a/gtk2_ardour/editor_mouse.cc b/gtk2_ardour/editor_mouse.cc index 13b5e6e8e5..6e71587c57 100644 --- a/gtk2_ardour/editor_mouse.cc +++ b/gtk2_ardour/editor_mouse.cc @@ -46,6 +46,8 @@ #include "ardour/session.h" #include "ardour/types.h" +#include "widgets/prompter.h" + #include "actions.h" #include "ardour_ui.h" #include "editor.h" @@ -58,7 +60,6 @@ #include "region_gain_line.h" #include "automation_time_axis.h" #include "control_point.h" -#include "prompter.h" #include "selection.h" #include "keyboard.h" #include "editing.h" @@ -2352,7 +2353,7 @@ Editor::mouse_rename_region (ArdourCanvas::Item* /*item*/, GdkEvent* /*event*/) { using namespace Gtkmm2ext; - ArdourPrompter prompter (false); + ArdourWidgets::Prompter prompter (false); prompter.set_prompt (_("Name for region:")); prompter.set_initial_text (clicked_regionview->region()->name()); diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc index 0441ee9e52..ea3e3ac74f 100644 --- a/gtk2_ardour/editor_ops.cc +++ b/gtk2_ardour/editor_ops.cc @@ -42,6 +42,7 @@ #include "widgets/choice.h" #include "widgets/popup.h" +#include "widgets/prompter.h" #include "ardour/audio_track.h" #include "ardour/audioregion.h" @@ -2121,7 +2122,7 @@ Editor::choose_new_marker_name(string &name) { return true; } - ArdourPrompter dialog (true); + Prompter dialog (true); dialog.set_prompt (_("New Name:")); diff --git a/gtk2_ardour/editor_route_groups.cc b/gtk2_ardour/editor_route_groups.cc index 13a74fb44a..bdbbb5d908 100644 --- a/gtk2_ardour/editor_route_groups.cc +++ b/gtk2_ardour/editor_route_groups.cc @@ -45,7 +45,6 @@ #include "gui_thread.h" #include "keyboard.h" #include "marker.h" -#include "prompter.h" #include "route_group_dialog.h" #include "route_time_axis.h" #include "time_axis_view.h" diff --git a/gtk2_ardour/editor_snapshots.cc b/gtk2_ardour/editor_snapshots.cc index 8ab16cc48b..355e4a3d88 100644 --- a/gtk2_ardour/editor_snapshots.cc +++ b/gtk2_ardour/editor_snapshots.cc @@ -32,12 +32,12 @@ #include "ardour/session_directory.h" #include "widgets/choice.h" +#include "widgets/prompter.h" #include "editor_snapshots.h" #include "ardour_ui.h" #include "pbd/i18n.h" #include "utils.h" -#include "prompter.h" using namespace std; using namespace PBD; @@ -143,7 +143,7 @@ EditorSnapshots::popup_context_menu (int button, int32_t time, std::string snaps void EditorSnapshots::rename (std::string old_name) { - ArdourPrompter prompter(true); + ArdourWidgets::Prompter prompter(true); string new_name; diff --git a/gtk2_ardour/generic_pluginui.cc b/gtk2_ardour/generic_pluginui.cc index 0f665d7891..1bd682a0a8 100644 --- a/gtk2_ardour/generic_pluginui.cc +++ b/gtk2_ardour/generic_pluginui.cc @@ -48,7 +48,6 @@ #include "widgets/slider_controller.h" #include "widgets/tooltips.h" -#include "prompter.h" #include "plugin_ui.h" #include "gui_thread.h" #include "automation_controller.h" diff --git a/gtk2_ardour/location_ui.cc b/gtk2_ardour/location_ui.cc index 83c261e474..658b7326d9 100644 --- a/gtk2_ardour/location_ui.cc +++ b/gtk2_ardour/location_ui.cc @@ -33,7 +33,6 @@ #include "gui_thread.h" #include "keyboard.h" #include "location_ui.h" -#include "prompter.h" #include "utils.h" #include "public_editor.h" #include "ui_config.h" diff --git a/gtk2_ardour/midi_time_axis.cc b/gtk2_ardour/midi_time_axis.cc index c572b2fac8..7bd7141c4e 100644 --- a/gtk2_ardour/midi_time_axis.cc +++ b/gtk2_ardour/midi_time_axis.cc @@ -82,7 +82,6 @@ #include "plugin_selector.h" #include "plugin_ui.h" #include "point_selection.h" -#include "prompter.h" #include "region_view.h" #include "rgb_macros.h" #include "selection.h" diff --git a/gtk2_ardour/mixer_ui.cc b/gtk2_ardour/mixer_ui.cc index 14a33ff361..1a4a897a72 100644 --- a/gtk2_ardour/mixer_ui.cc +++ b/gtk2_ardour/mixer_ui.cc @@ -63,7 +63,6 @@ #include "public_editor.h" #include "mouse_cursors.h" #include "ardour_ui.h" -#include "prompter.h" #include "utils.h" #include "route_sorter.h" #include "actions.h" diff --git a/gtk2_ardour/plugin_ui.cc b/gtk2_ardour/plugin_ui.cc index eb1dd55ece..011151e29b 100644 --- a/gtk2_ardour/plugin_ui.cc +++ b/gtk2_ardour/plugin_ui.cc @@ -63,7 +63,6 @@ #include "ardour_window.h" #include "ardour_ui.h" -#include "prompter.h" #include "plugin_ui.h" #include "utils.h" #include "gui_thread.h" diff --git a/gtk2_ardour/processor_box.cc b/gtk2_ardour/processor_box.cc index ec29255d90..1f5538c577 100644 --- a/gtk2_ardour/processor_box.cc +++ b/gtk2_ardour/processor_box.cc @@ -41,6 +41,7 @@ #include "gtkmm2ext/rgb_macros.h" #include "widgets/choice.h" +#include "widgets/prompter.h" #include "widgets/tooltips.h" #include "ardour/amp.h" @@ -3222,7 +3223,7 @@ ProcessorBox::idle_delete_processor (boost::weak_ptr weak_processor) void ProcessorBox::rename_processor (boost::shared_ptr processor) { - ArdourPrompter name_prompter (true); + Prompter name_prompter (true); string result; name_prompter.set_title (_("Rename Processor")); name_prompter.set_prompt (_("New name:")); diff --git a/gtk2_ardour/prompter.cc b/gtk2_ardour/prompter.cc deleted file mode 100644 index 6cf9018dbc..0000000000 --- a/gtk2_ardour/prompter.cc +++ /dev/null @@ -1,26 +0,0 @@ -/* - Copyright (C) 2002 Paul Davis - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - -*/ - -#include "prompter.h" - -ArdourPrompter::ArdourPrompter (bool modal) - : ArdourWidgets::Prompter (modal) -{ -} - diff --git a/gtk2_ardour/prompter.h b/gtk2_ardour/prompter.h deleted file mode 100644 index b01f845baf..0000000000 --- a/gtk2_ardour/prompter.h +++ /dev/null @@ -1,31 +0,0 @@ -/* - Copyright (C) 2002 Paul Davis - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - -*/ - -#ifndef __ardour_gtk_prompter_h__ -#define __ardour_gtk_prompter_h__ - -#include "widgets/prompter.h" - -class ArdourPrompter : public ArdourWidgets::Prompter -{ -public: - ArdourPrompter (bool modal = false); -}; - -#endif /* __ardour_gtk_prompter_h__ */ diff --git a/gtk2_ardour/route_time_axis.cc b/gtk2_ardour/route_time_axis.cc index 7cce7e6979..816365948a 100644 --- a/gtk2_ardour/route_time_axis.cc +++ b/gtk2_ardour/route_time_axis.cc @@ -59,6 +59,7 @@ #include "gtkmm2ext/utils.h" #include "widgets/ardour_button.h" +#include "widgets/prompter.h" #include "widgets/tooltips.h" #include "ardour_ui.h" @@ -74,7 +75,6 @@ #include "paste_context.h" #include "playlist_selector.h" #include "point_selection.h" -#include "prompter.h" #include "public_editor.h" #include "region_view.h" #include "rgb_macros.h" @@ -1125,7 +1125,7 @@ RouteTimeAxisView::set_align_choice (RadioMenuItem* mitem, AlignChoice choice, b void RouteTimeAxisView::rename_current_playlist () { - ArdourPrompter prompter (true); + Prompter prompter (true); string name; boost::shared_ptr tr = track(); @@ -1226,7 +1226,7 @@ RouteTimeAxisView::use_new_playlist (bool prompt, vector); diff --git a/gtk2_ardour/session_import_dialog.cc b/gtk2_ardour/session_import_dialog.cc index d4dd945b46..775b736076 100644 --- a/gtk2_ardour/session_import_dialog.cc +++ b/gtk2_ardour/session_import_dialog.cc @@ -31,9 +31,9 @@ #include "ardour/tempo_map_importer.h" #include "gtkmm2ext/utils.h" +#include "widgets/prompter.h" #include "gui_thread.h" -#include "prompter.h" #include "session_import_dialog.h" #include "pbd/i18n.h" @@ -285,7 +285,7 @@ SessionImportDialog::end_dialog () std::pair SessionImportDialog::open_rename_dialog (string text, string name) { - ArdourPrompter prompter(true); + ArdourWidgets::Prompter prompter(true); string new_name; prompter.set_name ("Prompter"); diff --git a/gtk2_ardour/sfdb_ui.cc b/gtk2_ardour/sfdb_ui.cc index 5664665014..c9788c8314 100644 --- a/gtk2_ardour/sfdb_ui.cc +++ b/gtk2_ardour/sfdb_ui.cc @@ -63,7 +63,6 @@ #include "ardour_ui.h" #include "editing.h" #include "gui_thread.h" -#include "prompter.h" #include "sfdb_ui.h" #include "editing.h" #include "gain_meter.h" diff --git a/gtk2_ardour/time_axis_view.h b/gtk2_ardour/time_axis_view.h index 10701563bf..7a06c26a64 100644 --- a/gtk2_ardour/time_axis_view.h +++ b/gtk2_ardour/time_axis_view.h @@ -46,7 +46,6 @@ #include "widgets/focus_entry.h" -#include "prompter.h" #include "axis_view.h" #include "enums.h" #include "editing.h" diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript index 96a5e7229f..6b0b4037c4 100644 --- a/gtk2_ardour/wscript +++ b/gtk2_ardour/wscript @@ -199,7 +199,6 @@ gtk2_ardour_sources = [ 'processor_selection.cc', 'patch_change_dialog.cc', 'progress_reporter.cc', - 'prompter.cc', 'public_editor.cc', 'quantize_dialog.cc', 'rc_option_editor.cc',