diff options
author | Taybin Rutkin <taybin@taybin.com> | 2006-01-13 19:48:55 +0000 |
---|---|---|
committer | Taybin Rutkin <taybin@taybin.com> | 2006-01-13 19:48:55 +0000 |
commit | 6817b59169b2c334245f8018d7e3f2235e195aa0 (patch) | |
tree | 030f9138e15dbae4d033083c3e5b89a41367345c /gtk2_ardour | |
parent | f5aef674d3c7a6541932be6e835d4e35f4be7920 (diff) |
Moved strip_whitespace_edges() to pbd/whitespace.h
Gtkmm2ext::Prompter::get_result() calls strip_whitespace_edges(), so you don't have to.
Removed unused/unecessary/forgotten headers from libpbd.
git-svn-id: svn://localhost/trunk/ardour2@270 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour')
-rw-r--r-- | gtk2_ardour/audio_time_axis.cc | 55 | ||||
-rw-r--r-- | gtk2_ardour/connection_editor.cc | 2 | ||||
-rw-r--r-- | gtk2_ardour/editor_edit_groups.cc | 2 | ||||
-rw-r--r-- | gtk2_ardour/editor_mouse.cc | 2 | ||||
-rw-r--r-- | gtk2_ardour/editor_selection_list.cc | 2 | ||||
-rw-r--r-- | gtk2_ardour/main.cc | 2 | ||||
-rw-r--r-- | gtk2_ardour/mixer_ui.cc | 2 | ||||
-rw-r--r-- | gtk2_ardour/option_editor.cc | 2 | ||||
-rw-r--r-- | gtk2_ardour/prompter.cc | 3 | ||||
-rw-r--r-- | gtk2_ardour/route_ui.cc | 7 | ||||
-rw-r--r-- | gtk2_ardour/sfdb_ui.cc | 24 | ||||
-rw-r--r-- | gtk2_ardour/utils.cc | 26 | ||||
-rw-r--r-- | gtk2_ardour/utils.h | 1 | ||||
-rw-r--r-- | gtk2_ardour/visual_time_axis.cc | 3 |
14 files changed, 61 insertions, 72 deletions
diff --git a/gtk2_ardour/audio_time_axis.cc b/gtk2_ardour/audio_time_axis.cc index 5c05c951b6..2adc56e43f 100644 --- a/gtk2_ardour/audio_time_axis.cc +++ b/gtk2_ardour/audio_time_axis.cc @@ -29,50 +29,51 @@ #include <pbd/error.h> #include <pbd/stl_delete.h> +#include <pbd/whitespace.h> -#include <gtkmm2ext/utils.h> -#include <gtkmm2ext/selector.h> +#include <gtkmm2ext/bindable_button.h> #include <gtkmm2ext/gtk_ui.h> +#include <gtkmm2ext/selector.h> #include <gtkmm2ext/stop_signal.h> -#include <gtkmm2ext/bindable_button.h> +#include <gtkmm2ext/utils.h> -#include <ardour/session.h> -#include <ardour/session_playlist.h> #include <ardour/audioplaylist.h> #include <ardour/diskstream.h> -#include <ardour/utils.h> -#include <ardour/playlist.h> -#include <ardour/ladspa_plugin.h> #include <ardour/insert.h> +#include <ardour/ladspa_plugin.h> #include <ardour/location.h> #include <ardour/panner.h> +#include <ardour/playlist.h> +#include <ardour/session.h> +#include <ardour/session_playlist.h> +#include <ardour/utils.h> #include "ardour_ui.h" -#include "public_editor.h" #include "audio_time_axis.h" -#include "streamview.h" -#include "simplerect.h" -#include "playlist_selector.h" -#include "plugin_selector.h" -#include "plugin_ui.h" -#include "regionview.h" #include "automation_gain_line.h" #include "automation_pan_line.h" #include "automation_time_axis.h" -#include "redirect_automation_time_axis.h" +#include "canvas_impl.h" +#include "crossfade_view.h" +#include "enums.h" #include "gain_automation_time_axis.h" +#include "gui_thread.h" +#include "keyboard.h" #include "pan_automation_time_axis.h" +#include "playlist_selector.h" +#include "plugin_selector.h" +#include "plugin_ui.h" +#include "point_selection.h" +#include "prompter.h" +#include "public_editor.h" #include "redirect_automation_line.h" +#include "redirect_automation_time_axis.h" +#include "regionview.h" +#include "rgb_macros.h" #include "selection.h" -#include "point_selection.h" -#include "enums.h" +#include "simplerect.h" +#include "streamview.h" #include "utils.h" -#include "keyboard.h" -#include "rgb_macros.h" -#include "prompter.h" -#include "crossfade_view.h" -#include "gui_thread.h" -#include "canvas_impl.h" #include <ardour/audio_track.h> @@ -834,7 +835,7 @@ AudioTimeAxisView::rename_current_playlist () prompter.set_initial_text (pl->name()); switch (prompter.run ()) { - case GTK_RESPONSE_ACCEPT: + case Gtk::RESPONSE_ACCEPT: prompter.get_result (name); pl->set_name (name); break; @@ -873,7 +874,7 @@ AudioTimeAxisView::use_copy_playlist () prompter.show_all (); switch (prompter.run ()) { - case GTK_RESPONSE_ACCEPT: + case Gtk::RESPONSE_ACCEPT: prompter.get_result (name); ds->use_copy_playlist (); pl = ds->playlist(); @@ -903,7 +904,7 @@ AudioTimeAxisView::use_new_playlist () prompter.set_initial_text (new_name); switch (prompter.run ()) { - case GTK_RESPONSE_ACCEPT: + case Gtk::RESPONSE_ACCEPT: prompter.get_result (name); ds->use_new_playlist (); pl = ds->playlist(); diff --git a/gtk2_ardour/connection_editor.cc b/gtk2_ardour/connection_editor.cc index 938be6763e..596029eeb3 100644 --- a/gtk2_ardour/connection_editor.cc +++ b/gtk2_ardour/connection_editor.cc @@ -658,7 +658,7 @@ ConnectionEditor::new_connection (bool for_input) prompter.done.connect (Gtk::Main::quit.slot()); switch (prompter.run()) { - case GTK_RESPONSE_ACCEPT: + case Gtk::RESPONSE_ACCEPT: prompter.get_result (name); push_at_front = true; if (name.length()) { diff --git a/gtk2_ardour/editor_edit_groups.cc b/gtk2_ardour/editor_edit_groups.cc index d66b313ac0..d9728345c8 100644 --- a/gtk2_ardour/editor_edit_groups.cc +++ b/gtk2_ardour/editor_edit_groups.cc @@ -88,7 +88,7 @@ Editor::new_edit_group () prompter.show_all (); switch (prompter.run ()) { - case GTK_RESPONSE_ACCEPT: + case Gtk::RESPONSE_ACCEPT: prompter.get_result (result); if (result.length()) { session->add_edit_group (result); diff --git a/gtk2_ardour/editor_mouse.cc b/gtk2_ardour/editor_mouse.cc index 64d00f56ab..c92eadc284 100644 --- a/gtk2_ardour/editor_mouse.cc +++ b/gtk2_ardour/editor_mouse.cc @@ -4464,7 +4464,7 @@ Editor::mouse_rename_region (ArdourCanvas::Item* item, GdkEvent* event) prompter.set_initial_text (clicked_regionview->region.name()); prompter.show_all (); switch (prompter.run ()) { - case GTK_RESPONSE_ACCEPT: + case Gtk::RESPONSE_ACCEPT: string str; prompter.get_result(str); if (str.length()) { diff --git a/gtk2_ardour/editor_selection_list.cc b/gtk2_ardour/editor_selection_list.cc index 64e184151e..90ff2027b7 100644 --- a/gtk2_ardour/editor_selection_list.cc +++ b/gtk2_ardour/editor_selection_list.cc @@ -112,7 +112,7 @@ Editor::name_selection () p.show_all (); switch (p.run ()) { - case GTK_RESPONSE_ACCEPT: + case Gtk::RESPONSE_ACCEPT: string name; p.get_result (name); if (name.length()) { diff --git a/gtk2_ardour/main.cc b/gtk2_ardour/main.cc index 3dc751de88..183729d960 100644 --- a/gtk2_ardour/main.cc +++ b/gtk2_ardour/main.cc @@ -31,8 +31,6 @@ #include <pbd/error.h> #include <pbd/textreceiver.h> -#include <pbd/platform.h> -#include <pbd/platform_factory.h> #include <pbd/failed_constructor.h> #include <pbd/pthread_utils.h> diff --git a/gtk2_ardour/mixer_ui.cc b/gtk2_ardour/mixer_ui.cc index cdd20e55cf..317f383170 100644 --- a/gtk2_ardour/mixer_ui.cc +++ b/gtk2_ardour/mixer_ui.cc @@ -690,7 +690,7 @@ Mixer_UI::new_mix_group () prompter.show_all (); switch (prompter.run ()) { - case GTK_RESPONSE_ACCEPT: + case Gtk::RESPONSE_ACCEPT: prompter.get_result (result); if (result.length()) { session->add_mix_group (result); diff --git a/gtk2_ardour/option_editor.cc b/gtk2_ardour/option_editor.cc index c31fdb98f5..491579b286 100644 --- a/gtk2_ardour/option_editor.cc +++ b/gtk2_ardour/option_editor.cc @@ -18,6 +18,8 @@ $Id$ */ +#include <pbd/whitespace.h> + #include <ardour/session.h> #include <ardour/audioengine.h> #include <ardour/configuration.h> diff --git a/gtk2_ardour/prompter.cc b/gtk2_ardour/prompter.cc index 08f089f404..a10bd92f72 100644 --- a/gtk2_ardour/prompter.cc +++ b/gtk2_ardour/prompter.cc @@ -19,9 +19,6 @@ */ #include "prompter.h" -#include "ardour_ui.h" - -using namespace sigc; ArdourPrompter::ArdourPrompter (bool modal) : Gtkmm2ext::Prompter (modal) diff --git a/gtk2_ardour/route_ui.cc b/gtk2_ardour/route_ui.cc index 82b6cac3bd..ed93c55811 100644 --- a/gtk2_ardour/route_ui.cc +++ b/gtk2_ardour/route_ui.cc @@ -740,10 +740,9 @@ RouteUI::route_rename () switch (name_prompter.run ()) { - case GTK_RESPONSE_ACCEPT: - name_prompter.get_result (result); - if (result.length()) { - strip_whitespace_edges (result); + case Gtk::RESPONSE_ACCEPT: + name_prompter.get_result (result); + if (result.length()) { _route.set_name (result, this); } break; diff --git a/gtk2_ardour/sfdb_ui.cc b/gtk2_ardour/sfdb_ui.cc index c79ad5c128..891a8dad19 100644 --- a/gtk2_ardour/sfdb_ui.cc +++ b/gtk2_ardour/sfdb_ui.cc @@ -20,7 +20,7 @@ */ #include <map> -#include <errno.h> +#include <cerrno> #include <sndfile.h> @@ -34,8 +34,9 @@ #include <ardour/sndfile_helpers.h> #include <ardour/sndfilesource.h> -#include "sfdb_ui.h" #include "gui_thread.h" +#include "prompter.h" +#include "sfdb_ui.h" #include "i18n.h" @@ -235,7 +236,24 @@ SoundFileBox::stop_btn_clicked () void SoundFileBox::add_field_clicked () -{} +{ + ArdourPrompter prompter (true); + string name; + + prompter.set_prompt (_("Name for field")); + + switch (prompter.run ()) { + case Gtk::RESPONSE_ACCEPT: + cout << name << endl; + prompter.get_result (name); + Library->add_field (name); + Library->save_changes (); + break; + + default: + break; + } +} void SoundFileBox::remove_field_clicked () diff --git a/gtk2_ardour/utils.cc b/gtk2_ardour/utils.cc index 1c4fc2a452..acc9574a18 100644 --- a/gtk2_ardour/utils.cc +++ b/gtk2_ardour/utils.cc @@ -147,32 +147,6 @@ atof (const string& s) return atof (s.c_str()); } -void -strip_whitespace_edges (string& str) -{ - string::size_type i; - string::size_type len; - string::size_type s; - - len = str.length(); - - for (i = 0; i < len; ++i) { - if (isgraph (str[i])) { - break; - } - } - - s = i; - - for (i = len - 1; i >= 0; --i) { - if (isgraph (str[i])) { - break; - } - } - - str = str.substr (s, (i - s) + 1); -} - vector<string> internationalize (const char **array) { diff --git a/gtk2_ardour/utils.h b/gtk2_ardour/utils.h index 221329727e..b6f3e0563a 100644 --- a/gtk2_ardour/utils.h +++ b/gtk2_ardour/utils.h @@ -55,7 +55,6 @@ std::string fit_to_pixels (const std::string &, int pixel_width, const std::stri int atoi (const std::string&); double atof (const std::string&); -void strip_whitespace_edges (std::string& str); void url_decode (std::string&); gint just_hide_it (GdkEventAny*, Gtk::Window*); void allow_keyboard_focus (bool); diff --git a/gtk2_ardour/visual_time_axis.cc b/gtk2_ardour/visual_time_axis.cc index 9782a8c9f6..b282b239e9 100644 --- a/gtk2_ardour/visual_time_axis.cc +++ b/gtk2_ardour/visual_time_axis.cc @@ -26,6 +26,7 @@ #include <pbd/error.h> #include <pbd/stl_delete.h> +#include <pbd/whitespace.h> #include <gtkmm2ext/utils.h> #include <gtkmm2ext/selector.h> @@ -361,7 +362,7 @@ VisualTimeAxis::start_time_axis_rename() name_prompter->show_all() ; switch (name_prompter->run ()) { - case GTK_RESPONSE_ACCEPT: + case Gtk::RESPONSE_ACCEPT: string result; name_prompter->get_result (result); if (editor.get_named_time_axis(result) != 0) { |