[Cvs-annodex] commit (annodex): liboggplay/trunk/src/liboggplay/Makefile.am liboggplay/trunk/src/liboggplay/oggplay_callback_info.c liboggplay/trunk/src/liboggplay/oggplay_private.h

[shans]

Update of /var/local/lib/svn/annodex (new revision 2392)

Modified files:
   liboggplay/trunk/src/liboggplay/Makefile.am
   liboggplay/trunk/src/liboggplay/oggplay_callback_info.c
   liboggplay/trunk/src/liboggplay/oggplay_private.h

Log Message:
Minimal checkin to get library compiling again



Modified: liboggplay/trunk/src/liboggplay/Makefile.am
===================================================================
--- liboggplay/trunk/src/liboggplay/Makefile.am	2006-08-18 06:33:13 UTC (rev 2391)
+++ liboggplay/trunk/src/liboggplay/Makefile.am	2006-08-18 08:27:01 UTC (rev 2392)
@@ -9,16 +9,17 @@
 # Libraries to build
 lib_LTLIBRARIES = liboggplay.la
 
-noinst_headers = 		\
-	oggplay_private.h	\
-	oggplay_file_reader.h	\
+noinst_headers =            \
+	oggplay_private.h       \
+	oggplay_file_reader.h   \
 	oggplay_callback.h	
 
-liboggplay_la_SOURCES = 	\
-	oggplay.c		\
+liboggplay_la_SOURCES =     \
+	oggplay.c               \
 	oggplay_file_reader.c	\
-	oggplay_callback.c	\
-	oggplay_query.c			\
-	oggplay_data.c
+	oggplay_callback.c      \
+	oggplay_query.c         \
+	oggplay_data.c          \
+    oggplay_callback_info.c
 
 liboggplay_la_LDFLAGS = -version-info @SHARED_VERSION_INFO@ @SHLIB_VERSION_ARG@

Modified: liboggplay/trunk/src/liboggplay/oggplay_callback_info.c
===================================================================
--- liboggplay/trunk/src/liboggplay/oggplay_callback_info.c	2006-08-18 06:33:13 UTC (rev 2391)
+++ liboggplay/trunk/src/liboggplay/oggplay_callback_info.c	2006-08-18 08:27:01 UTC (rev 2392)
@@ -36,6 +36,7 @@
  * Shane Stephens <shane.stephens at annodex.net>
  */
 #include "oggplay_private.h"
+#include <stdlib.h>
 
 int
 oggplay_callback_info_prepare(OggPlay *me, OggPlayCallbackInfo **info) {
@@ -49,7 +50,6 @@
     OggPlayCallbackInfo * track_info = info[i - 1];
     int                   count = 0;
     OggPlayDataHeader   * p;
-    OggPlayDataHeader   * records;
 
     for (p = track->data_list; p != NULL; p = p->next) {
       count++;

Modified: liboggplay/trunk/src/liboggplay/oggplay_private.h
===================================================================
--- liboggplay/trunk/src/liboggplay/oggplay_private.h	2006-08-18 06:33:13 UTC (rev 2391)
+++ liboggplay/trunk/src/liboggplay/oggplay_private.h	2006-08-18 08:27:01 UTC (rev 2392)
@@ -47,10 +47,10 @@
 struct _OggPlay;
 
 struct _OggPlayCallbackInfo {
-  OggPlayDataType     data_type;
-  int                 available_records;
-  int                 required_records;
-  OggPlayDataHeader * records;
+  OggPlayDataType       data_type;
+  int                   available_records;
+  int                   required_records;
+  OggPlayDataHeader **  records;
 };
 
 typedef struct {


-- 
shans