From 17f89d1c436e3b06817b9f39a1b554a0cb29e6a7 Mon Sep 17 00:00:00 2001
From: Nigel Pearson <npearson@mythtv.org>
Date: Fri, 10 Jun 2011 20:17:48 +1000
Subject: [PATCH] Mac OS X compile fixes after recent logging changes

---
 mythtv/libs/libmythtv/darwinavcinfo.cpp       |  2 +-
 .../libs/libmythtv/darwinfirewiredevice.cpp   | 23 ++++++++++---------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/mythtv/libs/libmythtv/darwinavcinfo.cpp b/mythtv/libs/libmythtv/darwinavcinfo.cpp
index 7224822b87f..d2ea1ecf347 100644
--- a/mythtv/libs/libmythtv/darwinavcinfo.cpp
+++ b/mythtv/libs/libmythtv/darwinavcinfo.cpp
@@ -97,7 +97,7 @@ void DarwinAVCInfo::Update(uint64_t _guid, DarwinFirewireDevice *dev,
     //////////////////////////
     // get subunit info
 
-    VERBOSE(VB_RECORD, "Scanning guid: 0x"<<hex<<guid<<dec);
+    VERBOSE(VB_RECORD, QString("Scanning guid: 0x%1").arg(guid, 0, 16));
 
     bool wasOpen = IsAVCInterfaceOpen();
     if (OpenAVCInterface(thread_cf_ref))
diff --git a/mythtv/libs/libmythtv/darwinfirewiredevice.cpp b/mythtv/libs/libmythtv/darwinfirewiredevice.cpp
index a8e54dba76d..19888851bba 100644
--- a/mythtv/libs/libmythtv/darwinfirewiredevice.cpp
+++ b/mythtv/libs/libmythtv/darwinfirewiredevice.cpp
@@ -330,7 +330,8 @@ bool DarwinFirewireDevice::OpenAVStream(void)
         return true;
 
     int max_speed = GetMaxSpeed();
-    VERBOSE(VB_IMPORTANT, "Max Speed: "<<max_speed<<" Our speed: "<<m_speed);
+    VERBOSE(VB_IMPORTANT, QString("Max Speed: %1, Our speed: %2")
+                          .arg(max_speed).arg(m_speed));
     m_speed = min((uint)max_speed, m_speed);
 
     uint fwchan = 0;
@@ -472,8 +473,8 @@ bool DarwinFirewireDevice::StartStreaming(void)
 
     m_priv->is_streaming = (kIOReturnSuccess == ret);
 
-    VERBOSE(VB_IMPORTANT, LOC + "Starting A/V streaming: "
-            <<((m_priv->is_streaming)?"success":"failure"));
+    VERBOSE(VB_IMPORTANT, (LOC + "Starting A/V streaming: %1")
+                          .arg((m_priv->is_streaming)?"success":"failure"));
 
     return m_priv->is_streaming;
 }
@@ -586,8 +587,8 @@ void DarwinFirewireDevice::ProcessStreamingMessage(
     {
         int ret = UpdatePlugRegister(plug_number, -1, -1, false, true);
 
-        VERBOSE(VB_IMPORTANT, LOC + "ReleaseIsochPort "
-                <<((kIOReturnSuccess == ret)?"ok":"error"));
+        VERBOSE(VB_IMPORTANT, (LOC + "ReleaseIsochPort %1")
+                              .arg((kIOReturnSuccess == ret)?"ok":"error"));
     }
     else if (AVS::kMpeg2ReceiverDCLOverrun == msg)
     {
@@ -657,7 +658,7 @@ void DarwinFirewireDevice::UpdateDeviceListItem(uint64_t guid, void *pitem)
     {
         DarwinAVCInfo *ptr = new DarwinAVCInfo();
 
-        VERBOSE(VB_IMPORTANT, "Adding   0x"<<hex<<guid<<dec);
+        VERBOSE(VB_IMPORTANT, QString("Adding   0x%1").arg(guid, 0, 16));
 
         m_priv->devices[guid] = ptr;
         it = m_priv->devices.find(guid);
@@ -666,7 +667,7 @@ void DarwinFirewireDevice::UpdateDeviceListItem(uint64_t guid, void *pitem)
     io_object_t &item = *((io_object_t*) pitem);
     if (it != m_priv->devices.end())
     {
-        VERBOSE(VB_IMPORTANT, "Updating 0x"<<hex<<guid<<dec);
+        VERBOSE(VB_IMPORTANT, QString("Updating 0x%1").arg(guid, 0, 16));
         (*it)->Update(guid, this, m_priv->notify_port,
                       m_priv->controller_thread_cf_ref, item);
     }
@@ -716,8 +717,8 @@ bool DarwinFirewireDevice::UpdatePlugRegisterPrivate(
     new_plug_cnt += ((add_plug) ? 1 : 0) - ((remove_plug) ? 1 : 0);
     if ((new_plug_cnt > 0x3f) || (new_plug_cnt < 0))
     {
-        VERBOSE(VB_IMPORTANT, LOC_ERR + "Invalid Plug Count "<<new_plug_cnt);
-
+        VERBOSE(VB_IMPORTANT, (LOC_ERR + "Invalid Plug Count %1")
+                              .arg(new_plug_cnt));
         return false;
     }
 
@@ -869,8 +870,8 @@ void DarwinFirewireDevice::HandleDeviceChange(uint messageType)
         VERBOSE(VB_RECORD, loc + "kIOMessageSystemWillRestart");
     else
     {
-        VERBOSE(VB_RECORD, loc + "unknown message 0x"
-                <<hex<<messageType<<dec);
+        VERBOSE(VB_RECORD, (loc + "unknown message 0x%1%2%3")
+                           .arg(messageType, 0, 16));
     }
 }