diff options
27 files changed, 136 insertions, 71 deletions
diff --git a/gtk2_ardour/bundle_manager.cc b/gtk2_ardour/bundle_manager.cc index 559bc7ed6c..ba00cce9d0 100644 --- a/gtk2_ardour/bundle_manager.cc +++ b/gtk2_ardour/bundle_manager.cc @@ -174,6 +174,12 @@ BundleEditorMatrix::list_is_global (int dim) const return (dim == OTHER); } +string +BundleEditorMatrix::disassociation_verb () const +{ + return _("Disassociate"); +} + BundleEditor::BundleEditor (Session* session, boost::shared_ptr<UserBundle> bundle) : ArdourDialog (_("Edit Bundle")), _matrix (this, session, bundle), _bundle (bundle) { diff --git a/gtk2_ardour/bundle_manager.h b/gtk2_ardour/bundle_manager.h index 4172330cf1..c2c30d47bb 100644 --- a/gtk2_ardour/bundle_manager.h +++ b/gtk2_ardour/bundle_manager.h @@ -25,7 +25,6 @@ #include <gtkmm/entry.h> #include "ardour_dialog.h" #include "port_matrix.h" -#include "i18n.h" namespace ARDOUR { class Session; @@ -50,9 +49,7 @@ class BundleEditorMatrix : public PortMatrix void setup_ports (int); bool list_is_global (int) const; - std::string disassociation_verb () const { - return _("Disassociate"); - } + std::string disassociation_verb () const; private: enum { diff --git a/gtk2_ardour/editor_export_audio.cc b/gtk2_ardour/editor_export_audio.cc index 51c2ef072a..6aa43c8bcf 100644 --- a/gtk2_ardour/editor_export_audio.cc +++ b/gtk2_ardour/editor_export_audio.cc @@ -58,7 +58,7 @@ using namespace Gtk; void Editor::export_audio () { - ExportDialog dialog (*this); + ExportDialog dialog (*this, _("Export")); dialog.set_session (_session); dialog.run(); } diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc index 8e17999d83..e5513159b0 100644 --- a/gtk2_ardour/editor_ops.cc +++ b/gtk2_ardour/editor_ops.cc @@ -4976,7 +4976,7 @@ Editor::set_fade_length (bool in) nframes64_t pos = get_preferred_edit_position(); nframes64_t len; - char* cmd; + char const * cmd; if (pos > rv->region()->last_frame() || pos < rv->region()->first_frame()) { /* edit point is outside the relevant region */ @@ -6192,7 +6192,8 @@ Editor::do_insert_time () return; } - InsertTimeOption opt; + /* only setting this to keep GCC quiet */ + InsertTimeOption opt = LeaveIntersected; switch (intersected_combo.get_active_row_number ()) { case 0: diff --git a/gtk2_ardour/export_dialog.cc b/gtk2_ardour/export_dialog.cc index d60e5753c4..ae8e963d9a 100644 --- a/gtk2_ardour/export_dialog.cc +++ b/gtk2_ardour/export_dialog.cc @@ -29,6 +29,8 @@ #include "export_dialog.h" #include "gui_thread.h" +#include "i18n.h" + using namespace ARDOUR; using namespace PBD; diff --git a/gtk2_ardour/export_dialog.h b/gtk2_ardour/export_dialog.h index 33a983062f..93d3b21654 100644 --- a/gtk2_ardour/export_dialog.h +++ b/gtk2_ardour/export_dialog.h @@ -34,8 +34,6 @@ #include <gtkmm.h> -#include "i18n.h" - namespace ARDOUR { class ExportStatus; class ExportHandler; @@ -48,7 +46,7 @@ class ExportDialog : public ArdourDialog { public: - explicit ExportDialog (PublicEditor & editor, Glib::ustring title = _("Export")); + explicit ExportDialog (PublicEditor & editor, Glib::ustring title); ~ExportDialog (); void set_session (ARDOUR::Session* s); diff --git a/gtk2_ardour/global_port_matrix.cc b/gtk2_ardour/global_port_matrix.cc index ae51e7fb68..510d3b3ce3 100644 --- a/gtk2_ardour/global_port_matrix.cc +++ b/gtk2_ardour/global_port_matrix.cc @@ -165,3 +165,16 @@ GlobalPortMatrixWindow::on_show () pair<uint32_t, uint32_t> const pm_max = _port_matrix.max_size (); resize_window_to_proportion_of_monitor (this, pm_max.first, pm_max.second); } + +string +GlobalPortMatrix::disassociation_verb () const +{ + return _("Disconnect"); +} + +string +GlobalPortMatrix::channel_noun () const +{ + return _("port"); +} + diff --git a/gtk2_ardour/global_port_matrix.h b/gtk2_ardour/global_port_matrix.h index 8e13866f42..0ce77f74c3 100644 --- a/gtk2_ardour/global_port_matrix.h +++ b/gtk2_ardour/global_port_matrix.h @@ -24,7 +24,6 @@ #include "port_matrix.h" #include "port_group.h" #include "ardour_dialog.h" -#include "i18n.h" class GlobalPortMatrix : public PortMatrix { @@ -36,13 +35,8 @@ public: void set_state (ARDOUR::BundleChannel c[2], bool); PortMatrixNode::State get_state (ARDOUR::BundleChannel c[2]) const; - std::string disassociation_verb () const { - return _("Disconnect"); - } - - std::string channel_noun () const { - return _("port"); - } + std::string disassociation_verb () const; + std::string channel_noun () const; bool list_is_global (int) const { return true; diff --git a/gtk2_ardour/io_selector.cc b/gtk2_ardour/io_selector.cc index b4e1af132a..913fa6dafe 100644 --- a/gtk2_ardour/io_selector.cc +++ b/gtk2_ardour/io_selector.cc @@ -157,6 +157,18 @@ IOSelector::list_is_global (int dim) const return (dim == _other); } +string +IOSelector::disassociation_verb () const +{ + return _("Disconnect"); +} + +string +IOSelector::channel_noun () const +{ + return _("port"); +} + IOSelectorWindow::IOSelectorWindow (ARDOUR::Session* session, boost::shared_ptr<ARDOUR::IO> io, bool /*can_cancel*/) : _selector (this, session, io) { diff --git a/gtk2_ardour/io_selector.h b/gtk2_ardour/io_selector.h index 11454f8531..21bd6a2d3e 100644 --- a/gtk2_ardour/io_selector.h +++ b/gtk2_ardour/io_selector.h @@ -22,7 +22,6 @@ #include "ardour_dialog.h" #include "port_matrix.h" -#include "i18n.h" namespace ARDOUR { class PortInsert; @@ -36,13 +35,8 @@ class IOSelector : public PortMatrix void set_state (ARDOUR::BundleChannel c[2], bool); PortMatrixNode::State get_state (ARDOUR::BundleChannel c[2]) const; - std::string disassociation_verb () const { - return _("Disconnect"); - } - - std::string channel_noun () const { - return _("port"); - } + std::string disassociation_verb () const; + std::string channel_noun () const; uint32_t n_io_ports () const; boost::shared_ptr<ARDOUR::IO> const io () { return _io; } diff --git a/gtk2_ardour/port_matrix.cc b/gtk2_ardour/port_matrix.cc index 88987f03ef..73e937e840 100644 --- a/gtk2_ardour/port_matrix.cc +++ b/gtk2_ardour/port_matrix.cc @@ -840,3 +840,9 @@ PortMatrix::port_connected_or_disconnected () { _body->rebuild_and_draw_grid (); } + +string +PortMatrix::channel_noun () const +{ + return _("channel"); +} diff --git a/gtk2_ardour/port_matrix.h b/gtk2_ardour/port_matrix.h index 0c0a52a1a1..52e2f1663b 100644 --- a/gtk2_ardour/port_matrix.h +++ b/gtk2_ardour/port_matrix.h @@ -35,7 +35,6 @@ #include "port_group.h" #include "port_matrix_types.h" -#include "i18n.h" /** The `port matrix' UI. This is a widget which lets the user alter * associations between one set of ports and another. e.g. to connect @@ -146,7 +145,7 @@ public: } virtual void rename_channel (ARDOUR::BundleChannel) {} virtual std::string disassociation_verb () const = 0; - virtual std::string channel_noun () const { return _("channel"); } + virtual std::string channel_noun () const; enum Result { Cancelled, diff --git a/gtk2_ardour/port_matrix_body.cc b/gtk2_ardour/port_matrix_body.cc index 063eaa8d8a..6da2ab87b5 100644 --- a/gtk2_ardour/port_matrix_body.cc +++ b/gtk2_ardour/port_matrix_body.cc @@ -28,6 +28,8 @@ #include "port_matrix_row_labels.h" #include "port_matrix_grid.h" +#include "i18n.h" + using namespace std; PortMatrixBody::PortMatrixBody (PortMatrix* p) diff --git a/gtk2_ardour/port_matrix_column_labels.cc b/gtk2_ardour/port_matrix_column_labels.cc index 522015548f..c3b10e289b 100644 --- a/gtk2_ardour/port_matrix_column_labels.cc +++ b/gtk2_ardour/port_matrix_column_labels.cc @@ -25,6 +25,8 @@ #include "port_matrix_body.h" #include "utils.h" +#include "i18n.h" + using namespace std; PortMatrixColumnLabels::PortMatrixColumnLabels (PortMatrix* m, PortMatrixBody* b) diff --git a/gtk2_ardour/return_ui.cc b/gtk2_ardour/return_ui.cc index 62762dee44..61fe2291a5 100644 --- a/gtk2_ardour/return_ui.cc +++ b/gtk2_ardour/return_ui.cc @@ -30,6 +30,8 @@ #include "ardour_ui.h" #include "gui_thread.h" +#include "i18n.h" + using namespace std; using namespace ARDOUR; using namespace PBD; diff --git a/gtk2_ardour/send_ui.cc b/gtk2_ardour/send_ui.cc index a0359a4856..3cc17faaea 100644 --- a/gtk2_ardour/send_ui.cc +++ b/gtk2_ardour/send_ui.cc @@ -30,6 +30,8 @@ #include "ardour_ui.h" #include "gui_thread.h" +#include "i18n.h" + using namespace std; using namespace ARDOUR; using namespace PBD; diff --git a/libs/ardour/ardour/audio_playlist_importer.h b/libs/ardour/ardour/audio_playlist_importer.h index 5ab8ae9b26..9b3abfc33d 100644 --- a/libs/ardour/ardour/audio_playlist_importer.h +++ b/libs/ardour/ardour/audio_playlist_importer.h @@ -32,8 +32,6 @@ #include "ardour/element_import_handler.h" #include "ardour/types.h" -#include "i18n.h" - namespace ARDOUR { class AudioRegionImportHandler; @@ -63,8 +61,8 @@ class UnusedAudioPlaylistImportHandler : public AudioPlaylistImportHandler { public: UnusedAudioPlaylistImportHandler (XMLTree const & source, Session & session, AudioRegionImportHandler & region_handler) : - AudioPlaylistImportHandler (source, session, region_handler, X_("UnusedPlaylists")) { } - std::string get_info () const { return _("Audio Playlists (unused)"); } + AudioPlaylistImportHandler (source, session, region_handler, "UnusedPlaylists") { } + std::string get_info () const; }; class AudioPlaylistImporter : public ElementImporter diff --git a/libs/ardour/ardour/export_failed.h b/libs/ardour/ardour/export_failed.h index 37f572f345..16687826b1 100644 --- a/libs/ardour/ardour/export_failed.h +++ b/libs/ardour/ardour/export_failed.h @@ -23,9 +23,6 @@ #include <exception> #include <string> -#include "pbd/error.h" - -#include "i18n.h" namespace ARDOUR { @@ -33,12 +30,7 @@ namespace ARDOUR class ExportFailed : public std::exception { public: - ExportFailed (std::string const & reason) - : reason (reason.c_str()) - { - PBD::error << string_compose (_("Export failed: %1"), reason) << endmsg; - } - + ExportFailed (std::string const &); ~ExportFailed () throw() { } const char* what() const throw() diff --git a/libs/ardour/ardour/monitor_processor.h b/libs/ardour/ardour/monitor_processor.h index 8b8e90573d..4bf399c16a 100644 --- a/libs/ardour/ardour/monitor_processor.h +++ b/libs/ardour/ardour/monitor_processor.h @@ -178,23 +178,7 @@ class MonitorProcessor : public Processor MPControl<gain_t>& polarity; MPControl<bool>& soloed; - ChannelRecord (uint32_t chn) : current_gain(1.0) - , cut_ptr (new MPControl<gain_t> (1.0, string_compose (_("cut control %1"), chn), PBD::Controllable::GainLike)) - , dim_ptr (new MPControl<bool> (false, string_compose (_("dim control"), chn), PBD::Controllable::Toggle)) - , polarity_ptr (new MPControl<gain_t> (1.0, string_compose (_("polarity control"), chn), PBD::Controllable::Toggle)) - , soloed_ptr (new MPControl<bool> (false, string_compose (_("solo control"), chn), PBD::Controllable::Toggle)) - - , cut_control (cut_ptr) - , dim_control (dim_ptr) - , polarity_control (polarity_ptr) - , soloed_control (soloed_ptr) - - , cut (*cut_ptr) - , dim (*dim_ptr) - , polarity (*polarity_ptr) - , soloed (*soloed_ptr) - - {} + ChannelRecord (uint32_t); }; std::vector<ChannelRecord*> _channels; diff --git a/libs/ardour/ardour/session_object.h b/libs/ardour/ardour/session_object.h index 715ffa0e0e..08d5e242f8 100644 --- a/libs/ardour/ardour/session_object.h +++ b/libs/ardour/ardour/session_object.h @@ -28,8 +28,6 @@ #include "ardour/ardour.h" #include "ardour/session_handle.h" -#include "i18n.h" - namespace ARDOUR { namespace Properties { diff --git a/libs/ardour/audio_playlist_importer.cc b/libs/ardour/audio_playlist_importer.cc index 3f773fc0a9..681f563e68 100644 --- a/libs/ardour/audio_playlist_importer.cc +++ b/libs/ardour/audio_playlist_importer.cc @@ -32,6 +32,8 @@ #include "ardour/playlist_factory.h" #include "ardour/session_playlists.h" +#include "i18n.h" + using namespace std; using namespace PBD; using namespace ARDOUR; @@ -252,3 +254,8 @@ AudioPlaylistImporter::populate_region_list () } } +string +UnusedAudioPlaylistImportHandler::get_info () const +{ + return _("Audio Playlists (unused)"); +} diff --git a/libs/ardour/export_failed.cc b/libs/ardour/export_failed.cc new file mode 100755 index 0000000000..97f2ee56ac --- /dev/null +++ b/libs/ardour/export_failed.cc @@ -0,0 +1,33 @@ +/* + Copyright (C) 2008 Paul Davis + Author: Sakari Bergen + + 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 "pbd/error.h" +#include "ardour/export_failed.h" + +#include "i18n.h" + +using namespace std; +using namespace ARDOUR; + +ExportFailed::ExportFailed (string const & reason) + : reason (reason.c_str()) +{ + PBD::error << string_compose (_("Export failed: %1"), reason) << endmsg; +} diff --git a/libs/ardour/export_handler.cc b/libs/ardour/export_handler.cc index 7893d8143c..988b9588a8 100644 --- a/libs/ardour/export_handler.cc +++ b/libs/ardour/export_handler.cc @@ -35,6 +35,8 @@ #include "ardour/export_filename.h" #include "ardour/export_failed.h" +#include "i18n.h" + using namespace std; using namespace PBD; diff --git a/libs/ardour/monitor_processor.cc b/libs/ardour/monitor_processor.cc index 80ed2b8e5d..6faf46a64d 100644 --- a/libs/ardour/monitor_processor.cc +++ b/libs/ardour/monitor_processor.cc @@ -510,3 +510,23 @@ MonitorProcessor::channel_solo_control (uint32_t chn) const } return boost::shared_ptr<Controllable>(); } + +MonitorProcessor::ChannelRecord::ChannelRecord (uint32_t chn) + : current_gain (1.0) + , cut_ptr (new MPControl<gain_t> (1.0, string_compose (_("cut control %1"), chn), PBD::Controllable::GainLike)) + , dim_ptr (new MPControl<bool> (false, string_compose (_("dim control"), chn), PBD::Controllable::Toggle)) + , polarity_ptr (new MPControl<gain_t> (1.0, string_compose (_("polarity control"), chn), PBD::Controllable::Toggle)) + , soloed_ptr (new MPControl<bool> (false, string_compose (_("solo control"), chn), PBD::Controllable::Toggle)) + + , cut_control (cut_ptr) + , dim_control (dim_ptr) + , polarity_control (polarity_ptr) + , soloed_control (soloed_ptr) + + , cut (*cut_ptr) + , dim (*dim_ptr) + , polarity (*polarity_ptr) + , soloed (*soloed_ptr) +{ + +} diff --git a/libs/ardour/session_object.cc b/libs/ardour/session_object.cc index b85a145ac0..b15771c986 100644 --- a/libs/ardour/session_object.cc +++ b/libs/ardour/session_object.cc @@ -21,6 +21,8 @@ #include "ardour/session_object.h" #include "ardour/debug.h" +#include "i18n.h" + using namespace ARDOUR; using namespace PBD; using namespace std; diff --git a/libs/ardour/wscript b/libs/ardour/wscript index 1aceb24e56..d12ab3cc94 100644 --- a/libs/ardour/wscript +++ b/libs/ardour/wscript @@ -80,6 +80,7 @@ libardour_sources = [ 'event_type_map.cc', 'export_channel.cc', 'export_channel_configuration.cc', + 'export_failed.cc', 'export_filename.cc', 'export_format_base.cc', 'export_format_manager.cc', diff --git a/libs/pbd/pbd/sequence_property.h b/libs/pbd/pbd/sequence_property.h index 875ae622b7..e55d3336cf 100644 --- a/libs/pbd/pbd/sequence_property.h +++ b/libs/pbd/pbd/sequence_property.h @@ -31,8 +31,6 @@ #include "pbd/id.h" #include "pbd/property_basics.h" -#include "i18n.h" - namespace PBD { /** A base class for properties whose state is a container of other @@ -83,23 +81,23 @@ class SequenceProperty : public PropertyBase if (!_change.added.empty()) { for (typename ChangeContainer::iterator i = _change.added.begin(); i != _change.added.end(); ++i) { - XMLNode* add_node = new XMLNode (X_("Add")); + XMLNode* add_node = new XMLNode ("Add"); child->add_child_nocopy (*add_node); - add_node->add_property (X_("id"), (*i)->id().to_s()); + add_node->add_property ("id", (*i)->id().to_s()); } } if (!_change.removed.empty()) { for (typename ChangeContainer::iterator i = _change.removed.begin(); i != _change.removed.end(); ++i) { - XMLNode* remove_node = new XMLNode (X_("Remove")); + XMLNode* remove_node = new XMLNode ("Remove"); child->add_child_nocopy (*remove_node); - remove_node->add_property (X_("id"), (*i)->id().to_s()); + remove_node->add_property ("id", (*i)->id().to_s()); } } } bool set_state_from_owner_state (XMLNode const& owner_state) { - XMLProperty const* n = owner_state.property (X_("name")); + XMLProperty const* n = owner_state.property ("name"); if (!n) { return false; @@ -111,10 +109,10 @@ class SequenceProperty : public PropertyBase for (XMLNodeList::const_iterator c = children.begin(); c != children.end(); ++c) { - if ((*c)->name() == X_("Added")) { + if ((*c)->name() == "Added") { const XMLNodeList& grandchildren = (*c)->children(); for (XMLNodeList::const_iterator gc = grandchildren.begin(); gc != grandchildren.end(); ++gc) { - const XMLProperty* prop = (*gc)->property (X_("id")); + const XMLProperty* prop = (*gc)->property ("id"); if (prop) { typename Container::value_type v = lookup_id (PBD::ID (prop->value())); if (v) { @@ -122,10 +120,10 @@ class SequenceProperty : public PropertyBase } } } - } else if ((*c)->name() == X_("Removed")) { + } else if ((*c)->name() == "Removed") { const XMLNodeList& grandchildren = (*c)->children(); for (XMLNodeList::const_iterator gc = grandchildren.begin(); gc != grandchildren.end(); ++gc) { - const XMLProperty* prop = (*gc)->property (X_("id")); + const XMLProperty* prop = (*gc)->property ("id"); if (prop) { typename Container::value_type v = lookup_id (PBD::ID (prop->value())); if (v) { |