From 9347e498720249794090388211a07b7c6872584f Mon Sep 17 00:00:00 2001
From: Nicolas Riendeau <nriendeau@mythtv.org>
Date: Fri, 19 Jul 2013 20:51:25 -0400
Subject: [PATCH] Remove additionnal QObject::tr() and permit translation using
 tr() only...

---
 mythtv/libs/libmythtv/audioplayer.cpp | 6 +++---
 mythtv/libs/libmythtv/audioplayer.h   | 2 ++
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/mythtv/libs/libmythtv/audioplayer.cpp b/mythtv/libs/libmythtv/audioplayer.cpp
index fdaaa026c14..2768dd8cad3 100644
--- a/mythtv/libs/libmythtv/audioplayer.cpp
+++ b/mythtv/libs/libmythtv/audioplayer.cpp
@@ -5,7 +5,7 @@
 
 #define LOC QString("AudioPlayer: ")
 
-static const QString _Location = QObject::tr("Audio Player");
+static const QString _Location = AudioPlayer::tr("Audio Player");
 
 AudioPlayer::AudioPlayer(MythPlayer *parent, bool muted)
   : m_parent(parent),     m_audioOutput(NULL),   m_channels(-1),
@@ -138,7 +138,7 @@ QString AudioPlayer::ReinitAudio(void)
         m_audioOutput = AudioOutput::OpenAudio(aos);
         if (!m_audioOutput)
         {
-            errMsg = QObject::tr("Unable to create AudioOutput.");
+            errMsg = tr("Unable to create AudioOutput.");
         }
         else
         {
@@ -160,7 +160,7 @@ QString AudioPlayer::ReinitAudio(void)
     {
         LOG(VB_GENERAL, LOG_NOTICE, LOC + "Disabling Audio" +
                 QString(", reason is: %1").arg(errMsg));
-        ShowNotificationError(QObject::tr("Disabling Audio"),
+        ShowNotificationError(tr("Disabling Audio"),
                               _Location, errMsg);
         m_no_audio_out = true;
     }
diff --git a/mythtv/libs/libmythtv/audioplayer.h b/mythtv/libs/libmythtv/audioplayer.h
index 60d4b14ff70..eae034f9dac 100644
--- a/mythtv/libs/libmythtv/audioplayer.h
+++ b/mythtv/libs/libmythtv/audioplayer.h
@@ -16,6 +16,8 @@ namespace MythTV
 
 class MTV_PUBLIC AudioPlayer
 {
+    Q_DECLARE_TR_FUNCTIONS(AudioPlayer)
+
   public:
     AudioPlayer(MythPlayer *parent, bool muted);
    ~AudioPlayer();