[xiph-commits] r8605 - trunk/oggdsf/src/tools/mod_oggchef

[ozone at motherfish-iii.xiph.org]

Author: ozone
Date: 2005-01-03 23:52:16 -0800 (Mon, 03 Jan 2005)
New Revision: 8605

Modified:
   trunk/oggdsf/src/tools/mod_oggchef/Makefile
   trunk/oggdsf/src/tools/mod_oggchef/anx_time.c
   trunk/oggdsf/src/tools/mod_oggchef/mod_oggchef.cpp
   trunk/oggdsf/src/tools/mod_oggchef/modules.mk
Log:
oggdsf:
 * Get mod_oggchef not only compiling, but actually working on UNIX



Modified: trunk/oggdsf/src/tools/mod_oggchef/Makefile
===================================================================
--- trunk/oggdsf/src/tools/mod_oggchef/Makefile	2005-01-04 07:41:40 UTC (rev 8604)
+++ trunk/oggdsf/src/tools/mod_oggchef/Makefile	2005-01-04 07:52:16 UTC (rev 8605)
@@ -39,7 +39,7 @@
 #   additional defines, includes and libraries
 #DEFS=-Dmy_define=my_value
 #INCLUDES=-Imy/include/dir
-LIBS=-lOOOgg -lOOOggSeek
+SH_LIBS=-lOOOgg -lOOOggSeek -lOOOggChef
 CXXFLAGS=-w
 CFLAGS=-w
 

Modified: trunk/oggdsf/src/tools/mod_oggchef/anx_time.c
===================================================================
--- trunk/oggdsf/src/tools/mod_oggchef/anx_time.c	2005-01-04 07:41:40 UTC (rev 8604)
+++ trunk/oggdsf/src/tools/mod_oggchef/anx_time.c	2005-01-04 07:52:16 UTC (rev 8605)
@@ -30,6 +30,8 @@
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
+#include "anx_time.h"
+
 #include <stdio.h>
 #include <math.h>
 

Modified: trunk/oggdsf/src/tools/mod_oggchef/mod_oggchef.cpp
===================================================================
--- trunk/oggdsf/src/tools/mod_oggchef/mod_oggchef.cpp	2005-01-04 07:41:40 UTC (rev 8604)
+++ trunk/oggdsf/src/tools/mod_oggchef/mod_oggchef.cpp	2005-01-04 07:52:16 UTC (rev 8605)
@@ -86,7 +86,7 @@
 	return (p2.first < p1.first);
 }
 
-const vector<const string> *preferredOutputMIMETypes(request_rec *inRequest)
+const vector<string> *preferredOutputMIMETypes(request_rec *inRequest)
 {
 
 	// If the user requested the application/ mime type (i.e. the entire
@@ -101,9 +101,9 @@
 			)
 		)
 	{
-		vector<const string>* locAcceptAllMimeTypes = new vector<const string>;
+		vector<string>* locAcceptAllMimeTypes = new vector<string>;
 		locAcceptAllMimeTypes->push_back("*/*");
-		return const_cast<const vector<const string>*> (locAcceptAllMimeTypes);
+		return const_cast<const vector<string>*> (locAcceptAllMimeTypes);
 	}
 
 	vector<tQualityPair> locQualityList;
@@ -129,12 +129,12 @@
 
 	// Since we have a quality rating now, output only the first (preferred)
 	// MIME type that we want
-	vector<const string>* locMIMETypes = new vector<const string>;
+	vector<string>* locMIMETypes = new vector<string>;
 	tQualityPair locElement = locQualityList[0];
-	const string locMIMEType = locElement.second;
+	string locMIMEType = locElement.second;
 	locMIMETypes->push_back(locMIMEType);
 
-	return const_cast<const vector<const string>*> (locMIMETypes);
+	return const_cast<const vector<string>*> (locMIMETypes);
 }
 
 bool httpDataSender (unsigned char *inBuffer, unsigned long inBufferLength, void *inUserData)
@@ -165,7 +165,7 @@
 		anx_parse_time(locRequestedStartTimeAsCString);
 
 	// What's the output MIME type requested?
-	const vector<const string>* locOutputMIMETypes = preferredOutputMIMETypes(inRequest);
+	const vector<string>* locOutputMIMETypes = preferredOutputMIMETypes(inRequest);
 
 #ifdef DEBUG
 	for (unsigned int i = 0; i < locOutputMIMETypes->size(); i++) {
@@ -218,3 +218,6 @@
 };
 
 } /* extern "C" */
+
+// vi:ts=4
+

Modified: trunk/oggdsf/src/tools/mod_oggchef/modules.mk
===================================================================
--- trunk/oggdsf/src/tools/mod_oggchef/modules.mk	2005-01-04 07:41:40 UTC (rev 8604)
+++ trunk/oggdsf/src/tools/mod_oggchef/modules.mk	2005-01-04 07:52:16 UTC (rev 8605)
@@ -1,4 +1,4 @@
 mod_oggchef.la: mod_oggchef.slo anx_time.slo query_utils.slo
-	$(SH_LINK) -rpath $(libexecdir) -module -avoid-version  mod_oggchef.lo
+	$(SH_LINK) -rpath $(libexecdir) -module -avoid-version  mod_oggchef.lo anx_time.lo query_utils.lo
 DISTCLEAN_TARGETS = modules.mk
 shared =  mod_oggchef.la