[xiph-commits] r12774 - in trunk/xiph-qt: OggImport/src build-macosx/XiphQT.xcodeproj

[arek at svn.xiph.org]

Author: arek
Date: 2007-03-18 03:29:42 -0700 (Sun, 18 Mar 2007)
New Revision: 12774

Modified:
   trunk/xiph-qt/OggImport/src/OggImport.c
   trunk/xiph-qt/build-macosx/XiphQT.xcodeproj/project.pbxproj
Log:
This workaround is no longer needed.

Modified: trunk/xiph-qt/OggImport/src/OggImport.c
===================================================================
--- trunk/xiph-qt/OggImport/src/OggImport.c	2007-03-17 22:36:02 UTC (rev 12773)
+++ trunk/xiph-qt/OggImport/src/OggImport.c	2007-03-18 10:29:42 UTC (rev 12774)
@@ -926,8 +926,6 @@
         if (si != NULL && si->sfhf->gp_to_time != NULL) {
             err = (*si->sfhf->gp_to_time)(si, &globals->lp_GP, &tr);
         } else if (si != NULL) {
-            //TimeRecord tr = {SInt64ToWide(globals->lp_GP),
-            //                 si->rate, NULL};
             tr.value = SInt64ToWide(globals->lp_GP);
             tr.scale = si->rate;
             tr.base = NULL;
@@ -2005,11 +2003,7 @@
     dbg_printf("-- SetIdleManager() called\n");
     globals->idleManager = im;
 
-    if (globals->dataReader
-#if defined(XIPHQT_DATAH_IDLEMANAGER_NET_ONLY)
-        && globals->dataIsStream
-#endif /* XIPHQT_DATAH_IDLEMANAGER_NET_ONLY */
-        ) {
+    if (globals->dataReader) {
         if (CallComponentCanDo(globals->dataReader, kDataHSetIdleManagerSelect) == true) {
             globals->dataIdleManager = QTIdleManagerOpen();
             if (globals->dataIdleManager != NULL) {

Modified: trunk/xiph-qt/build-macosx/XiphQT.xcodeproj/project.pbxproj
===================================================================
--- trunk/xiph-qt/build-macosx/XiphQT.xcodeproj/project.pbxproj	2007-03-17 22:36:02 UTC (rev 12773)
+++ trunk/xiph-qt/build-macosx/XiphQT.xcodeproj/project.pbxproj	2007-03-18 10:29:42 UTC (rev 12774)
@@ -1509,7 +1509,6 @@
 				INFOPLIST_FILE = Info.plist;
 				INSTALL_PATH = "$(HOME)/Library/QuickTime";
 				OTHER_REZFLAGS = "$(inherited) -D TARGET_REZ_MAC_PPC=1 -D BUILD_UNIVERSAL";
-				PER_ARCH_CFLAGS_i386 = "-D XIPHQT_DATAH_IDLEMANAGER_NET_ONLY";
 				PRODUCT_NAME = XiphQT;
 				WRAPPER_EXTENSION = component;
 				ZERO_LINK = YES;
@@ -1547,7 +1546,6 @@
 					"-ffast-math",
 				);
 				OTHER_REZFLAGS = "$(inherited) -D TARGET_REZ_MAC_PPC=1 -D BUILD_UNIVERSAL";
-				PER_ARCH_CFLAGS_i386 = "-D XIPHQT_DATAH_IDLEMANAGER_NET_ONLY";
 				PRODUCT_NAME = XiphQT;
 				WRAPPER_EXTENSION = component;
 			};
@@ -1611,7 +1609,6 @@
 				INFOPLIST_FILE = "Info (decoders).plist";
 				INSTALL_PATH = "$(HOME)/Library/QuickTime";
 				OTHER_REZFLAGS = "$(inherited) -D TARGET_REZ_MAC_PPC=1 -D BUILD_UNIVERSAL";
-				PER_ARCH_CFLAGS_i386 = "-D XIPHQT_DATAH_IDLEMANAGER_NET_ONLY";
 				PRODUCT_NAME = "XiphQT (decoders)";
 				WRAPPER_EXTENSION = component;
 				ZERO_LINK = YES;
@@ -1650,7 +1647,6 @@
 					"-ffast-math",
 				);
 				OTHER_REZFLAGS = "$(inherited) -D TARGET_REZ_MAC_PPC=1 -D BUILD_UNIVERSAL";
-				PER_ARCH_CFLAGS_i386 = "-D XIPHQT_DATAH_IDLEMANAGER_NET_ONLY";
 				PRODUCT_NAME = "XiphQT (decoders)";
 				WRAPPER_EXTENSION = component;
 			};