diff --git a/mythtv/i18n/translate.pro b/mythtv/i18n/translate.pro index d1a82846a6e..4a938c6c1f8 100644 --- a/mythtv/i18n/translate.pro +++ b/mythtv/i18n/translate.pro @@ -2,6 +2,8 @@ SOURCES += ../libs/libmythbase/*.cpp SOURCES += ../libs/libmythbase/*.h SOURCES += ../libs/libmyth/*.cpp SOURCES += ../libs/libmyth/*.h +SOURCES += ../libs/libmyth/audio/*.cpp +SOURCES += ../libs/libmyth/audio/*.h SOURCES += ../libs/libmythmetadata/*.cpp SOURCES += ../libs/libmythtv/*.cpp SOURCES += ../libs/libmythtv/*.h diff --git a/mythtv/libs/libmyth/audio/audiooutputjack.cpp b/mythtv/libs/libmyth/audio/audiooutputjack.cpp index cf43e0a2c7d..0dfbe7da91b 100644 --- a/mythtv/libs/libmyth/audio/audiooutputjack.cpp +++ b/mythtv/libs/libmyth/audio/audiooutputjack.cpp @@ -65,7 +65,7 @@ AudioOutputSettings* AudioOutputJACK::GetOutputSettings(bool /*digital*/) client = _jack_client_open(); if (!client) { - JERROR(QObject::tr("Cannot start/connect to jack server " + JERROR(tr("Cannot start/connect to jack server " "(to check supported rate/channels)")); delete settings; return NULL; @@ -76,7 +76,7 @@ AudioOutputSettings* AudioOutputJACK::GetOutputSettings(bool /*digital*/) if (!rate) { - JERROR(QObject::tr("Unable to retrieve jack server sample rate")); + JERROR(tr("Unable to retrieve jack server sample rate")); goto err_out; } else @@ -90,7 +90,7 @@ AudioOutputSettings* AudioOutputJACK::GetOutputSettings(bool /*digital*/) if (!matching_ports || !matching_ports[0]) { - JERROR(QObject::tr("No ports available to connect to")); + JERROR(tr("No ports available to connect to")); goto err_out; } // Count matching ports from 2nd port upwards @@ -130,7 +130,7 @@ bool AudioOutputJACK::OpenDevice() // We have a hard coded channel limit - check we haven't exceeded it if (channels > JACK_CHANNELS_MAX) { - JERROR(QObject::tr("Requested more channels: (%1), than the maximum: %2") + JERROR(tr("Requested more channels: (%1), than the maximum: %2") .arg(channels).arg(JACK_CHANNELS_MAX)); return false; } @@ -146,7 +146,7 @@ bool AudioOutputJACK::OpenDevice() client = _jack_client_open(); if (!client) { - JERROR(QObject::tr("Cannot start/connect to jack server")); + JERROR(tr("Cannot start/connect to jack server")); goto err_out; } @@ -154,7 +154,7 @@ bool AudioOutputJACK::OpenDevice() matching_ports = _jack_get_ports(); if (!matching_ports || !matching_ports[0]) { - JERROR(QObject::tr("No ports available to connect to")); + JERROR(tr("No ports available to connect to")); goto err_out; } @@ -165,7 +165,7 @@ bool AudioOutputJACK::OpenDevice() // ensure enough ports to satisfy request if (channels > i) { - JERROR(QObject::tr("Not enough ports available to connect to")); + JERROR(tr("Not enough ports available to connect to")); goto err_out; } @@ -178,7 +178,7 @@ bool AudioOutputJACK::OpenDevice() JackPortIsOutput, 0); if (!ports[i]) { - JERROR(QObject::tr("Error while registering new jack port: %1").arg(i)); + JERROR(tr("Error while registering new jack port: %1").arg(i)); goto err_out; } } @@ -199,16 +199,16 @@ bool AudioOutputJACK::OpenDevice() // These will actually get called after jack_activate()! // ...Possibly even before this OpenDevice sub returns... if (jack_set_process_callback(client, _JackCallback, this)) - JERROR(QObject::tr("Error. Unable to set process callback?!")); + JERROR(tr("Error. Unable to set process callback?!")); if (jack_set_xrun_callback(client, _JackXRunCallback, this)) - JERROR(QObject::tr("Error. Unable to set xrun callback?!")); + JERROR(tr("Error. Unable to set xrun callback?!")); if (jack_set_graph_order_callback(client, _JackGraphOrderCallback, this)) - JERROR(QObject::tr("Error. Unable to set graph order change callback?!")); + JERROR(tr("Error. Unable to set graph order change callback?!")); // Activate! Everything comes into life after here. Beware races if (jack_activate(client)) { - JERROR(QObject::tr("Calling jack_activate failed")); + JERROR(tr("Calling jack_activate failed")); goto err_out; } @@ -615,7 +615,7 @@ bool AudioOutputJACK::_jack_connect_ports(const char** matching_ports) { if (jack_connect(client, jack_port_name(ports[i]), matching_ports[i])) { - JERROR(QObject::tr("Calling jack_connect failed on port: %1\n").arg(i)); + JERROR(tr("Calling jack_connect failed on port: %1\n").arg(i)); return false; } } @@ -629,7 +629,7 @@ void AudioOutputJACK::_jack_client_close(jack_client_t **client) { int err = jack_client_close(*client); if (err != 0) - JERROR(QObject::tr("Error closing Jack output device. Error: %1") + JERROR(tr("Error closing Jack output device. Error: %1") .arg(err)); *client = NULL; } diff --git a/mythtv/libs/libmyth/audio/audiooutputjack.h b/mythtv/libs/libmyth/audio/audiooutputjack.h index af38dac2a84..64de8b583f7 100644 --- a/mythtv/libs/libmyth/audio/audiooutputjack.h +++ b/mythtv/libs/libmyth/audio/audiooutputjack.h @@ -1,6 +1,9 @@ #ifndef AUDIOOUTPUTJACK #define AUDIOOUTPUTJACK +// Qt headers +#include + #include #include #include "audiooutputbase.h" @@ -14,6 +17,8 @@ using namespace std; class AudioOutputJACK : public AudioOutputBase { + Q_DECLARE_TR_FUNCTIONS(AudioOutputJACK) + public: AudioOutputJACK(const AudioSettings &settings); virtual ~AudioOutputJACK();