Merge branch 'jyavenard/backports/fixes/0.24' of github.com:MythTV/my…

…thtv into jyavenard/backports/fixes/0.24
MythTV · Mar 13, 2012 · 539dd5f · 539dd5f
2 parents e80e51f + a1d8e2b
commit 539dd5f
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 28 deletions.
diff --git a/mythtv/libs/libmyth/audiooutputca.cpp b/mythtv/libs/libmyth/audiooutputca.cpp
@@ -201,17 +201,28 @@ AudioOutputSettings* AudioOutputCA::GetOutputSettings(bool digital)
     // Seek hardware sample rate available
     int rate;
     int *rates = d->RatesList(d->mDeviceID);
-    int *p_rates = rates;
 
-    while (*p_rates > 0 && (rate = settings->GetNextRate()))
+    if (rates == NULL)
     {
-        if (*p_rates == rate)
+        // Error retrieving rates, assume 48kHz
+        settings->AddSupportedRate(48000);
+    }
+    else
+    {
+        while ((rate = settings->GetNextRate()))
         {
-            settings->AddSupportedRate(*p_rates);
-            p_rates++;
+			int *p_rates = rates;
+			while (*p_rates > 0)
+			{
+				if (*p_rates == rate)
+				{
+					settings->AddSupportedRate(*p_rates);
+				}
+                p_rates++;
+            }
         }
+        free(rates);
     }
-    free(rates);
 
     // Supported format: 16 bits audio or float
     settings->AddSupportedFormat(FORMAT_S16);
@@ -1715,4 +1726,4 @@ QMap<QString, QString> *AudioOutputCA::GetDevices(const char *type)
         }
     }
     return devs;
-}
+}
diff --git a/mythtv/libs/libmyth/mythcdrom-darwin.cpp b/mythtv/libs/libmyth/mythcdrom-darwin.cpp
@@ -1,6 +1,5 @@
 #include <errno.h>
 #include <sys/fcntl.h>
-#include <unistd.h> // for close definition
 
 #include <IOKit/storage/IOCDMediaBSDClient.h>
 #include <IOKit/storage/IODVDMediaBSDClient.h>

diff --git a/mythtv/libs/libmythtv/darwinfirewiredevice.cpp b/mythtv/libs/libmythtv/darwinfirewiredevice.cpp
@@ -62,12 +62,12 @@ namespace AVS
 #define kResetTimeout             1500 /* msec */
 
 static IOReturn dfd_tspacket_handler_thunk(
-    UInt32 tsPacketCount, UInt32 **ppBuf, void *callback_data);
+    long unsigned int tsPacketCount, UInt32 **ppBuf, void *callback_data);
 static void dfd_update_device_list(void *dfd, io_iterator_t iterator);
 static void dfd_streaming_log_message(char *pString);
 void *dfd_controller_thunk(void *param);
-void dfd_stream_msg(UInt32 msg, UInt32 param1,
-                    UInt32 param2, void *callback_data);
+void dfd_stream_msg(long unsigned int msg, long unsigned int param1,
+                    long unsigned int param2, void *callback_data);
 int dfd_no_data_notification(void *callback_data);
 
 class DFDPriv
@@ -894,8 +894,8 @@ int dfd_no_data_notification(void *callback_data)
     return kIOReturnSuccess;
 }
 
-void dfd_stream_msg(UInt32 msg, UInt32 param1,
-                    UInt32 param2, void *callback_data)
+void dfd_stream_msg(long unsigned int msg, long unsigned int param1,
+                    long unsigned int param2, void *callback_data)
 {
     ((DarwinFirewireDevice*)callback_data)->
         ProcessStreamingMessage(msg, param1, param2);
@@ -915,7 +915,7 @@ int dfd_tspacket_handler(uint tsPacketCount, uint32_t **ppBuf,
 }
 
 static IOReturn dfd_tspacket_handler_thunk(
-    UInt32 tsPacketCount, UInt32 **ppBuf, void *callback_data)
+    long unsigned int tsPacketCount, UInt32 **ppBuf, void *callback_data)
 {
     return dfd_tspacket_handler(
         tsPacketCount, (uint32_t**)ppBuf, callback_data);

diff --git a/mythtv/libs/libmythtv/darwinfirewiredevice.h b/mythtv/libs/libmythtv/darwinfirewiredevice.h
@@ -2,7 +2,6 @@
 #define _DARWIN_FIREWIRE_DEVICE_H_
 
 #include "firewiredevice.h"
-#include <IOKit/IOKitLib.h>
 
 class DFDPriv;
 class DarwinAVCInfo;
@@ -14,8 +13,8 @@ class DarwinFirewireDevice : public FirewireDevice
                                        uint64_t guid, void *item);
     friend int dfd_no_data_notification(void *cb_data);
     friend void dfd_stream_msg(
-        UInt32 msg, UInt32 param1,
-        UInt32 param2, void *callback_data);
+        long unsigned int msg, long unsigned int param1,
+        long unsigned int param2, void *callback_data);
     friend int dfd_tspacket_handler(
         uint tsPacketCount, uint32_t **ppBuf, void *callback_data);
 

diff --git a/mythtv/libs/libmythtv/firewirechannel.cpp b/mythtv/libs/libmythtv/firewirechannel.cpp
@@ -8,9 +8,7 @@
 #include "mythverbose.h"
 #include "tv_rec.h"
 #include "linuxfirewiredevice.h"
-#if USING_OSX_FIREWIRE
 #include "darwinfirewiredevice.h"
-#endif
 #include "firewirechannel.h"
 
 #define LOC QString("FireChan(%1): ").arg(GetDevice())

diff --git a/mythtv/libs/libmythtv/firewiredevice.cpp b/mythtv/libs/libmythtv/firewiredevice.cpp
@@ -12,9 +12,7 @@
 
 // MythTV headers
 #include "linuxfirewiredevice.h"
-#if USING_OSX_FIREWIRE
 #include "darwinfirewiredevice.h"
-#endif
 #include "mythverbose.h"
 #include "pespacket.h"
 

diff --git a/mythtv/libs/libmythtv/libmythtv.pro b/mythtv/libs/libmythtv/libmythtv.pro
@@ -87,7 +87,7 @@ QMAKE_LFLAGS_SHLIB += $${FREETYPE_LIBS}
 
 macx {
     # Mac OS X Frameworks
-    FWKS = AGL ApplicationServices Carbon Cocoa CoreServices CoreFoundation OpenGL QuickTime IOKit
+    FWKS = AGL ApplicationServices Carbon Cocoa CoreFoundation OpenGL QuickTime IOKit
     using_quartz_video {
         FWKS += QuartzCore
     } else {

diff --git a/mythtv/libs/libmythui/libmythui.pro b/mythtv/libs/libmythui/libmythui.pro
@@ -89,7 +89,6 @@ macx {
     HEADERS += screensaver-osx.h   DisplayResOSX.h   util-osx.h   util-osx-cocoa.h
     SOURCES += screensaver-osx.cpp DisplayResOSX.cpp util-osx.cpp util-osx-cocoa.mm
 
-    QMAKE_CXXFLAGS += -F/System/Library/Frameworks/CoreServices.framework/Frameworks
     QMAKE_CXXFLAGS += -F/System/Library/Frameworks/ApplicationServices.framework/Frameworks
     QMAKE_CXXFLAGS += -F/System/Library/Frameworks/Carbon.framework/Frameworks
     QMAKE_CXXFLAGS += -F/System/Library/Frameworks/Cocoa.framework/Frameworks

diff --git a/mythtv/libs/libmythui/util-osx.h b/mythtv/libs/libmythui/util-osx.h
@@ -1,10 +1,5 @@
 #ifndef UTIL_OSX_H
 #define UTIL_OSX_H
-
-#if _USING_105SDK
-#import <CarbonCore/Endian.h>
-#endif
-
 #import <CoreFoundation/CFDictionary.h> 
 #import "ApplicationServices/ApplicationServices.h"
 #include <QWindowsStyle>