diff options
Diffstat (limited to 'libs/ardour/ardour')
-rw-r--r-- | libs/ardour/ardour/audio_playlist_importer.h | 6 | ||||
-rw-r--r-- | libs/ardour/ardour/export_failed.h | 10 | ||||
-rw-r--r-- | libs/ardour/ardour/monitor_processor.h | 18 | ||||
-rw-r--r-- | libs/ardour/ardour/session_object.h | 2 |
4 files changed, 4 insertions, 32 deletions
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 { |