From 10fcf336a66f0203ed764d8b44f97bbf1c47e702 Mon Sep 17 00:00:00 2001 From: Jean-Yves Avenard Date: Sun, 7 Jul 2013 00:09:37 +1000 Subject: [PATCH] Make some strings translatable so they can be passed on to user --- mythtv/libs/libmyth/audio/audiooutputalsa.cpp | 4 +-- mythtv/libs/libmyth/audio/audiooutputbase.cpp | 10 +++---- mythtv/libs/libmyth/audio/audiooutputdx.cpp | 6 ++-- mythtv/libs/libmyth/audio/audiooutputjack.cpp | 30 +++++++++---------- mythtv/libs/libmyth/audio/audiooutputoss.cpp | 1 + 5 files changed, 26 insertions(+), 25 deletions(-) diff --git a/mythtv/libs/libmyth/audio/audiooutputalsa.cpp b/mythtv/libs/libmyth/audio/audiooutputalsa.cpp index 171f948a2b1..0d140bbacdd 100644 --- a/mythtv/libs/libmyth/audio/audiooutputalsa.cpp +++ b/mythtv/libs/libmyth/audio/audiooutputalsa.cpp @@ -475,7 +475,7 @@ bool AudioOutputALSA::OpenDevice() case FORMAT_S32: format = SND_PCM_FORMAT_S32; break; case FORMAT_FLT: format = SND_PCM_FORMAT_FLOAT; break; default: - Error(QString("Unknown sample format: %1").arg(output_format)); + Error(QObject::tr("Unknown sample format: %1").arg(output_format)); return false; } @@ -679,7 +679,7 @@ int AudioOutputALSA::SetParameters(snd_pcm_t *handle, snd_pcm_format_t format, if (handle == NULL) { - Error("SetParameters() called with handle == NULL!"); + Error(QObject::tr("SetParameters() called with handle == NULL!")); return -1; } diff --git a/mythtv/libs/libmyth/audio/audiooutputbase.cpp b/mythtv/libs/libmyth/audio/audiooutputbase.cpp index 98eaacd0208..c2d47f2c814 100644 --- a/mythtv/libs/libmyth/audio/audiooutputbase.cpp +++ b/mythtv/libs/libmyth/audio/audiooutputbase.cpp @@ -650,8 +650,8 @@ void AudioOutputBase::Reconfigure(const AudioSettings &orig_settings) if (needs_downmix && source_channels > 8) { - Error("Aborting Audio Reconfigure. " - "Can't handle audio with more than 8 channels."); + Error(QObject::tr("Aborting Audio Reconfigure. " + "Can't handle audio with more than 8 channels.")); return; } @@ -702,7 +702,7 @@ void AudioOutputBase::Reconfigure(const AudioSettings &orig_settings) src_ctx = src_new(2-src_quality, chans, &error); if (error) { - Error(QString("Error creating resampler: %1") + Error(QObject::tr("Error creating resampler: %1") .arg(src_strerror(error))); src_ctx = NULL; return; @@ -738,7 +738,7 @@ void AudioOutputBase::Reconfigure(const AudioSettings &orig_settings) if (!encoder->Init(AV_CODEC_ID_AC3, 448000, samplerate, configured_channels)) { - Error("AC-3 encoder initialization failed"); + Error(QObject::tr("AC-3 encoder initialization failed")); delete encoder; encoder = NULL; enc = false; @@ -799,7 +799,7 @@ void AudioOutputBase::Reconfigure(const AudioSettings &orig_settings) if (!OpenDevice()) { if (GetError().isEmpty()) - Error("Aborting reconfigure"); + Error(QObject::tr("Aborting reconfigure")); else VBGENERAL("Aborting reconfigure"); m_configure_succeeded = false; diff --git a/mythtv/libs/libmyth/audio/audiooutputdx.cpp b/mythtv/libs/libmyth/audio/audiooutputdx.cpp index ac95a58aac9..a013a4a33e2 100644 --- a/mythtv/libs/libmyth/audio/audiooutputdx.cpp +++ b/mythtv/libs/libmyth/audio/audiooutputdx.cpp @@ -435,7 +435,7 @@ bool AudioOutputDX::OpenDevice(void) m_priv->InitDirectSound(m_UseSPDIF); if (!m_priv->dsobject || !m_priv->dsound_dll) { - Error("DirectSound initialization failed"); + Error(QObject::tr("DirectSound initialization failed")); return false; } @@ -507,10 +507,10 @@ bool AudioOutputDX::OpenDevice(void) if (FAILED(dsresult)) { if (dsresult == DSERR_UNSUPPORTED) - Error(QString("Unsupported format for device %1:%2") + Error(QObject::tr("Unsupported format for device %1:%2") .arg(m_priv->device_num).arg(m_priv->device_name)); else - Error(QString("Failed to create DS buffer 0x%1") + Error(QObject::tr("Failed to create DS buffer 0x%1") .arg((DWORD)dsresult, 0, 16)); return false; } diff --git a/mythtv/libs/libmyth/audio/audiooutputjack.cpp b/mythtv/libs/libmyth/audio/audiooutputjack.cpp index 22284ff4ae2..cf43e0a2c7d 100644 --- a/mythtv/libs/libmyth/audio/audiooutputjack.cpp +++ b/mythtv/libs/libmyth/audio/audiooutputjack.cpp @@ -65,8 +65,8 @@ AudioOutputSettings* AudioOutputJACK::GetOutputSettings(bool /*digital*/) client = _jack_client_open(); if (!client) { - JERROR("Cannot start/connect to jack server " - "(to check supported rate/channels)"); + JERROR(QObject::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("Unable to retrieve jack server sample rate"); + JERROR(QObject::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("No ports available to connect to"); + JERROR(QObject::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(QString("Requested more channels: (%1), than the maximum: %2") + JERROR(QObject::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("Cannot start/connect to jack server"); + JERROR(QObject::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("No ports available to connect to"); + JERROR(QObject::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("Not enough ports available to connect to"); + JERROR(QObject::tr("Not enough ports available to connect to")); goto err_out; } @@ -178,7 +178,7 @@ bool AudioOutputJACK::OpenDevice() JackPortIsOutput, 0); if (!ports[i]) { - JERROR(QString("Error while registering new jack port: %1").arg(i)); + JERROR(QObject::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("Error. Unable to set process callback?!"); + JERROR(QObject::tr("Error. Unable to set process callback?!")); if (jack_set_xrun_callback(client, _JackXRunCallback, this)) - JERROR("Error. Unable to set xrun callback?!"); + JERROR(QObject::tr("Error. Unable to set xrun callback?!")); if (jack_set_graph_order_callback(client, _JackGraphOrderCallback, this)) - JERROR("Error. Unable to set graph order change callback?!"); + JERROR(QObject::tr("Error. Unable to set graph order change callback?!")); // Activate! Everything comes into life after here. Beware races if (jack_activate(client)) { - JERROR("Calling jack_activate failed"); + JERROR(QObject::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(QString("Calling jack_connect failed on port: %1\n").arg(i)); + JERROR(QObject::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(QString("Error closing Jack output device. Error: %1") + JERROR(QObject::tr("Error closing Jack output device. Error: %1") .arg(err)); *client = NULL; } diff --git a/mythtv/libs/libmyth/audio/audiooutputoss.cpp b/mythtv/libs/libmyth/audio/audiooutputoss.cpp index 00c008409d0..aa63bb07007 100644 --- a/mythtv/libs/libmyth/audio/audiooutputoss.cpp +++ b/mythtv/libs/libmyth/audio/audiooutputoss.cpp @@ -140,6 +140,7 @@ bool AudioOutputOSS::OpenDevice() if (audiofd == -1) { + Error(QObject::tr("Error opening audio device (%1)").arg(main_device)); VBERRENO(QString("Error opening audio device (%1)").arg(main_device)); return false; }