Fri Jun 30 01:42:15 UTC 2006

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

Added files:
   liboggsync/
   liboggsync/trunk/
   liboggsync/trunk/AUTHORS
   liboggsync/trunk/COPYING
   liboggsync/trunk/ChangeLog
   liboggsync/trunk/INSTALL
   liboggsync/trunk/Makefile.am
   liboggsync/trunk/NEWS
   liboggsync/trunk/README
   liboggsync/trunk/autogen.sh
   liboggsync/trunk/config.h.in
   liboggsync/trunk/configure.ac
   liboggsync/trunk/doc/
   liboggsync/trunk/doc/interface.txt
   liboggsync/trunk/include/
   liboggsync/trunk/include/Makefile.am
   liboggsync/trunk/include/oggsync/
   liboggsync/trunk/include/oggsync/Makefile.am
   liboggsync/trunk/include/oggsync/oggsync.h
   liboggsync/trunk/include/oggsync/oggsync_enums.h
   liboggsync/trunk/include/oggsync/oggsync_reader.h
   liboggsync/trunk/m4/
   liboggsync/trunk/m4/as-ac-expand.m4
   liboggsync/trunk/oggsync.pc.in
   liboggsync/trunk/src/
   liboggsync/trunk/src/Makefile.am
   liboggsync/trunk/src/liboggsync/
   liboggsync/trunk/src/liboggsync/.deps/
   liboggsync/trunk/src/liboggsync/.deps/oggsync.Plo
   liboggsync/trunk/src/liboggsync/Makefile.am
   liboggsync/trunk/src/liboggsync/Version_script.in
   liboggsync/trunk/src/liboggsync/oggsync.c
   liboggsync/trunk/src/liboggsync/oggsync_private.h

Log Message:
Initial import of liboggsync skeleton



Added: liboggsync/trunk/AUTHORS
===================================================================

Added: liboggsync/trunk/COPYING
===================================================================

--- liboggsync/trunk/COPYING	2006-06-26 14:19:09 UTC (rev 2344)
+++ liboggsync/trunk/COPYING	2006-06-30 01:42:14 UTC (rev 2345)
@@ -0,0 +1 @@
+link /usr/share/automake-1.9/COPYING
\ No newline at end of file


Property changes on: liboggsync/trunk/COPYING
___________________________________________________________________
Name: svn:special
   + *

Added: liboggsync/trunk/ChangeLog
===================================================================

Added: liboggsync/trunk/INSTALL
===================================================================
--- liboggsync/trunk/INSTALL	2006-06-26 14:19:09 UTC (rev 2344)
+++ liboggsync/trunk/INSTALL	2006-06-30 01:42:14 UTC (rev 2345)
@@ -0,0 +1 @@
+link /usr/share/automake-1.9/INSTALL
\ No newline at end of file


Property changes on: liboggsync/trunk/INSTALL
___________________________________________________________________
Name: svn:special
   + *

Added: liboggsync/trunk/Makefile.am
===================================================================
--- liboggsync/trunk/Makefile.am	2006-06-26 14:19:09 UTC (rev 2344)
+++ liboggsync/trunk/Makefile.am	2006-06-30 01:42:14 UTC (rev 2345)
@@ -0,0 +1,36 @@
+# Copyright (C) 2003 Commonwealth Scientific and Industrial Research
+# Organisation (CSIRO) Australia
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# - Redistributions of source code must retain the above copyright
+#   notice, this list of conditions and the following disclaimer.
+# 
+# - Redistributions in binary form must reproduce the above copyright
+#   notice, this list of conditions and the following disclaimer in the
+#   documentation and/or other materials provided with the distribution.
+#
+# - Neither the name of CSIRO Australia nor the names of its
+#   contributors may be used to endorse or promote products derived from
+#   this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+# PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE ORGANISATION OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# Process this file with automake to produce Makefile.in
+
+SUBDIRS = include src
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = oggsync.pc

Added: liboggsync/trunk/NEWS
===================================================================

Added: liboggsync/trunk/README
===================================================================

Added: liboggsync/trunk/autogen.sh
===================================================================
--- liboggsync/trunk/autogen.sh	2006-06-26 14:19:09 UTC (rev 2344)
+++ liboggsync/trunk/autogen.sh	2006-06-30 01:42:14 UTC (rev 2345)
@@ -0,0 +1,165 @@
+#!/bin/sh
+
+# autogoat!
+# an omnivorous assistant for autotools
+#
+#         (__) 
+#         (oo) 
+#   /------\/ 
+#  / |    ||   
+# *  /\---/\ 
+#    ~~   ~~   
+
+# clean function
+clean ()
+{
+  # remove autotools cruft
+  rm -f aclocal.m4 configure config.log
+  rm -Rf autom4te.cache
+  # remove old autotools extra cruft
+  rm -f config.guess config.sub missing mkinstalldirs compile depcomp install-sh
+  # remove libtool cruft
+  rm -f ltmain.sh libtool ltconfig
+}
+
+
+#
+# option checking
+#
+
+if test "x$1" = "xclean"; then
+  set -x
+  clean
+  set +x
+  exit 0
+fi
+
+
+
+#
+# check automake version number -- we require >= 1.5
+#
+
+automake_version="none"
+if automake-1.7 --version >/dev/null 2>&1; then
+  automake_version="-1.7"
+elif automake-1.6 --version >/dev/null 2>&1; then
+  automake_version="-1.6"
+elif automake-1.5 --version >/dev/null 2>&1; then
+  automake_version="-1.5"
+elif automake --version > /dev/null 2>&1; then
+  automake_version=""
+  case "`automake --version | sed -e '1s/[^0-9]*//' -e q`" in
+    0|0.*|1|1.[01234]|1.[01234][-.]*) automake_version="none" ;;
+    1.5*)                             automake_version="-1.5" ;;
+    1.6*)                             automake_version="-1.6" ;;
+    1.7*)                             automake_version="-1.7" ;;
+    1.8*)                             automake_version="-1.8" ;;
+    1.9*)                             automake_version="-1.9" ;;
+  esac
+fi
+
+if test "x${automake_version}" = "xnone"; then
+  set +x
+  echo "you need automake version 1.5 or later"
+  exit 1
+fi
+
+automake_version_major=`echo "$automake_version" | cut -d. -f2`
+automake_version_minor=`echo "$automake_version" | cut -d. -f3`
+
+# need at least automake >= 1.5
+if test "$automake_version_major" -lt "5"; then
+  echo "$0"': this project requires automake >= 1.5.  Please upgrade your version of automake to at least 1.5'
+  exit 1
+fi
+
+
+#
+# do we need pkg-config?
+#
+
+if grep -q PKG_CHECK_MODULES configure.*; then
+  if ! pkg-config --version > /dev/null 2> /dev/null; then
+    cat << EOF
+pkg-config is required, but it's not installed or can't be found in your
+search path.
+
+EOF
+    # be nice to the user if they have fink!
+    if test -d /sw ; then
+      cat << EOF
+You can install it via Fink with the command:
+
+ apt-get install pkgconfig
+
+EOF
+    fi
+    exit 1
+  fi
+fi
+
+
+#
+# autogoat bootstrap process
+# 
+
+ACLOCAL=${ACLOCAL:-aclocal}
+AUTOCONF=${AUTOCONF:-autoconf}
+AUTOHEADER=${AUTOHEADER:-autoheader}
+AUTOMAKE=${AUTOMAKE:-automake}
+
+# clean out old cruft
+clean
+
+# add Fink's /sw path to various search directories
+if [ -d /sw ]; then
+  ACLOCAL="$ACLOCAL -I /sw/share/aclocal"
+  FINK_DETECTED=1
+fi
+
+eval "$ACLOCAL -I m4"
+
+# do we need libtool?
+if grep -q PROG_LIBTOOL configure.*; then
+  # what's libtoolize called?
+  if glibtoolize --version > /dev/null 2> /dev/null; then
+    LIBTOOLIZE="glibtoolize"
+  elif libtoolize --version > /dev/null 2> /dev/null; then
+    LIBTOOLIZE="libtoolize"
+  fi
+
+  # check libtool version -- only support 1.4 or 1.5 for now
+  if "$LIBTOOLIZE" --version | egrep -q '1\.4|1\.5'; then
+    if grep -q AC_LIBLTDL_CONVENIENCE configure.*; then
+      "$LIBTOOLIZE" --ltdl --copy --force
+    else
+      "$LIBTOOLIZE" --copy --force
+    fi
+  else
+    # libtool version is too old :(
+    echo "$0: need libtool >= 1.4 installed"
+    exit 1
+  fi
+fi
+
+eval "$AUTOCONF"
+grep -q CONFIG_HEADER configure.* && "$AUTOHEADER"
+eval "$AUTOMAKE" --add-missing --copy
+
+# Print warning message if Fink detected
+if test "$FINK_DETECTED" = 1; then
+  cat << EOF
+
+Fink detected; added /sw/share/aclocal to aclocal's include directories.
+Make sure you have CPPFLAGS, LDFLAGS and PKG_CONFIG_PATH including Fink's
+distribution directories, e.g.:
+
+ export CPPFLAGS="-I/sw/include \$CPPFLAGS"
+ export LDFLAGS="-L/sw/lib \$LDFLAGS"
+ export PKG_CONFIG_PATH="/sw/lib/pkgconfig:\$PKG_CONFIG_PATH"
+ ./configure
+
+EOF
+fi
+


Property changes on: liboggsync/trunk/autogen.sh
___________________________________________________________________
Name: svn:executable
   + 

Added: liboggsync/trunk/config.h.in
===================================================================
--- liboggsync/trunk/config.h.in	2006-06-26 14:19:09 UTC (rev 2344)
+++ liboggsync/trunk/config.h.in	2006-06-30 01:42:14 UTC (rev 2345)
@@ -0,0 +1,65 @@
+/* config.h.in.  Generated from configure.ac by autoheader.  */
+
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#undef HAVE_DLFCN_H
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#undef HAVE_INTTYPES_H
+
+/* Define to 1 if you have the <memory.h> header file. */
+#undef HAVE_MEMORY_H
+
+/* Define if have liboggz */
+#undef HAVE_OGGZ
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#undef HAVE_STDINT_H
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#undef HAVE_STDLIB_H
+
+/* Define to 1 if you have the <strings.h> header file. */
+#undef HAVE_STRINGS_H
+
+/* Define to 1 if you have the <string.h> header file. */
+#undef HAVE_STRING_H
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#undef HAVE_SYS_STAT_H
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#undef HAVE_SYS_TYPES_H
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#undef HAVE_UNISTD_H
+
+/* Name of package */
+#undef PACKAGE
+
+/* Define to the address where bug reports for this package should be sent. */
+#undef PACKAGE_BUGREPORT
+
+/* Define to the full name of this package. */
+#undef PACKAGE_NAME
+
+/* Define to the full name and version of this package. */
+#undef PACKAGE_STRING
+
+/* Define to the one symbol short name of this package. */
+#undef PACKAGE_TARNAME
+
+/* Define to the version of this package. */
+#undef PACKAGE_VERSION
+
+/* Define to 1 if you have the ANSI C header files. */
+#undef STDC_HEADERS
+
+/* Version number of package */
+#undef VERSION
+
+/* Define to 1 if your processor stores words with the most significant byte
+   first (like Motorola and SPARC, unlike Intel and VAX). */
+#undef WORDS_BIGENDIAN
+
+/* Define to empty if `const' does not conform to ANSI C. */
+#undef const

Added: liboggsync/trunk/configure.ac
===================================================================
--- liboggsync/trunk/configure.ac	2006-06-26 14:19:09 UTC (rev 2344)
+++ liboggsync/trunk/configure.ac	2006-06-30 01:42:14 UTC (rev 2345)
@@ -0,0 +1,172 @@
+# Process this file with autoconf to produce a configure script.
+AC_INIT
+AC_CONFIG_SRCDIR([src/liboggsync/oggsync.c])
+
+AC_PREREQ(2.53)
+
+AC_CANONICAL_TARGET
+
+AM_INIT_AUTOMAKE(liboggsync, 0.0.1.svn)
+AM_CONFIG_HEADER(config.h)
+
+SHARED_VERSION_INFO="1:0:0"
+SHLIB_VERSION_ARG=""
+
+# Checks for programs
+AC_PROG_CC
+AC_PROG_LIBTOOL
+AC_PROG_INSTALL
+AC_PROG_MAKE_SET
+
+AC_C_CONST
+AC_C_BIGENDIAN
+
+dnl Add parameters for aclocal
+AC_SUBST(ACLOCAL_AMFLAGS, "-I m4")
+
+dnl Overall configuration success flag
+oggsync_config_ok=yes
+
+oggsync_examples=""
+
+dnl
+dnl  Detect oggz
+dnl
+
+PKG_CHECK_MODULES(OGGZ, oggz > 0.5.40, HAVE_OGGZ="yes", HAVE_OGGZ="no")
+
+if test "$HAVE_OGGZ" = "yes" ; then
+  AC_DEFINE(HAVE_OGGZ, [], [Define if have liboggz])
+  AC_SUBST(OGGZ_LIBS)
+else
+  AC_CHECK_LIB(oggz, oggz_open, OGGZ_LIBS="maybe")
+  if test "$OGGZ_LIBS" = "maybe" ; then
+    AC_MSG_ERROR([
+***
+*** liboggz-0.5.20 or greater seems to exist on your system, however
+*** the pkg-config tool cannot find its build information.
+***
+*** Please set your PKG_CONFIG_PATH environment variable to include the
+*** directory in which oggz.pc was installed. For example, oggz.pc
+*** is installed in /usr/local/lib/pkgconfig by default; if that is the
+*** case do:
+***
+***     export PKG_CONFIG_PATH="\$PKG_CONFIG_PATH:/usr/local/lib/pkgconfig"
+***
+*** then run this ./configure again. If you configured liboggz with a
+*** different --prefix option, replace /usr/local above with that prefix.
+***
+])
+  else
+    AC_MSG_ERROR([
+***
+*** liboggz-0.5.20 or greater does not seem to exist on your system.  Please
+*** install it and run this ./configure again
+***
+])
+  fi
+fi
+
+dnl Use -Wall if we have gcc.
+dnl changequote(,)dnl
+if test "x$ac_cv_prog_gcc" = xyes ; then
+  CFLAGS="$CFLAGS -Wall -g"
+fi
+dnl changequote([,])dnl
+
+case "$target_os" in
+  darwin* | rhapsody*)
+    dnl Disable -Wall and -pedantic for Apple Darwin/Rhapsody.
+    dnl System headers on these systems are broken.
+    temp_CFLAGS=`echo $CFLAGS | sed "s/-Wall -pedantic//"`
+    CFLAGS=$temp_CFLAGS
+    ;;
+  linux* | solaris*)
+    SHLIB_VERSION_ARG="-Wl,--version-script=Version_script"
+    ;;
+  *)
+    ;;
+esac
+
+dnl
+dnl  Configuration tests complete -- provide summary of results.
+dnl
+
+if test $oggsync_config_ok = no ; then
+
+AC_MSG_RESULT([
+**************************************************************
+
+*** $PACKAGE $VERSION: Automatic configuration FAILED.
+
+*** The file config.log has full details.
+
+*** The following required libraries are missing or
+*** misconfigured on your system:
+])
+
+if test "x$HAVE_OGGZ" != xyes ; then
+    AC_MSG_RESULT(
+[*** liboggz, available from http://www.annodex.net/])
+fi
+
+AC_MSG_RESULT(
+[*** If you install the required libraries from source, you
+*** need to inform the dynamic linker of their location. If
+*** you install them in a system-wide directory such as
+*** /usr/local (the default), you must ensure that
+*** /usr/local/lib is listed in /etc/ld.so.conf, then run
+*** ldconfig to update the dynamic linking system.
+*** Alternatively, you can set your LD_LIBRARY_PATH environment
+*** variable to include the library installation directory.
+])
+
+
+AC_MSG_RESULT(
+[**************************************************************
+])
+
+
+AC_MSG_ERROR([
+***
+*** After fixing the above problems, you must run ./configure again.
+***
+])
+
+else
+
+AC_SUBST(SHLIB_VERSION_ARG)
+AC_SUBST(SHARED_VERSION_INFO)
+
+AC_OUTPUT([
+Makefile
+include/Makefile
+include/oggsync/Makefile
+src/Makefile
+src/liboggsync/Makefile
+src/liboggsync/Version_script
+oggsync.pc
+])
+
+AS_AC_EXPAND(LIBDIR, ${libdir})
+AS_AC_EXPAND(INCLUDEDIR, ${includedir})
+AS_AC_EXPAND(BINDIR, ${bindir})
+
+AC_MSG_RESULT([
+------------------------------------------------------------------------
+  $PACKAGE $VERSION:  Automatic configuration OK.
+
+  Installation paths:
+
+    libfishsound: ................ ${LIBDIR}
+    C header files: .............. ${INCLUDEDIR}/fishsound
+
+  Building:
+
+    Type 'make' to compile $PACKAGE.
+
+    Type 'make install' to install $PACKAGE.
+------------------------------------------------------------------------
+])
+
+fi

Added: liboggsync/trunk/doc/interface.txt
===================================================================
--- liboggsync/trunk/doc/interface.txt	2006-06-26 14:19:09 UTC (rev 2344)
+++ liboggsync/trunk/doc/interface.txt	2006-06-30 01:42:14 UTC (rev 2345)
@@ -0,0 +1,58 @@
+OggSync:              opaque internal data pointer
+OggSyncReader:        reader object for retrieving data
+OggSyncErrorCode:     enumeration of error codes
+OggSyncDataCallback:  callback to indicate decoded synchronised data is 
+                      available (return value can be used to pause decoding)
+OggSyncFrames:        struct containing frame data, frame size, and number of
+                      frames available
+OggSyncAudio:         struct containing audio data, audio information, and
+                      number of samples available
+OggSyncCMML:          struct containing cmml data
+
+/* initialisation */
+OggSync * or NULL <- ogg_sync_init()
+OggSyncErrorCode  <- ogg_sync_set_reader(OggSync *, OggSyncReader *)
+OggSyncErrorCode  <- ogg_sync_set_source(OggSync *, char *)
+
+/* stream querying */
+int               <- ogg_sync_get_num_streams(OggSync *)
+OggzContentType   <- ogg_sync_get_stream_type(OggSync *, int)
+OggSyncErrorCode  <- ogg_sync_set_stream_active(OggSync *, int)
+
+/* playback control */
+OggSyncErrorCode  <- ogg_sync_set_data_callback(OggSync *, OggSyncDataCallback)
+OggSyncErrorCode  <- ogg_sync_set_callback_rate(OggSync *, ogg_int64_t)
+OggSyncErrorCode  <- ogg_sync_set_granulepos_rate(OggSync *, int, ogg_int64_t)
+OggSyncErrorCode  <- ogg_sync_start_decoding(OggSync *)
+OggSyncErrorCode  <- ogg_sync_seek(OggSync *, ogg_int64_t)
+OggSyncErrorCode  <- ogg_sync_seek_granulepos(OggSync *, ogg_int64_t)
+
+/* call from within OggSyncDataCallback */
+OggSyncErrorCode  <- ogg_sync_caching_hint(OggSync *)
+OggSyncFrames *   <- ogg_sync_get_video_data(OggSync *, int)
+OggSyncAudio *    <- ogg_sync_get_audio_data(OggSync *, int)
+OggSyncCMML *     <- ogg_sync_get_cmml_data(OggSync *, int)
+
+/* calls that break Reader abstraction */
+OggSyncCMML *     <- ogg_sync_extract_all_cmml(OggSync *)
+
+------------------------------------------------------------------------
+
+/* OggSyncReader API */
+
+OggSyncReader *    <- initialise()
+OggSyncErrorCode   <- set_source(OggSyncReader *, char *)
+OggSyncErrorCode   <- destroy(OggSyncReader *)
+                
+/* return size, location of data, absolute pos in pointers. */
+OggSyncErrorCode   <- get_next_chunk(OggSyncReader *, char **, int *, int *)
+OggSyncErrorCode   <- seek_to_chunk(OggSyncReader *, int)
+
+/* mark a chunk as not required again in the immediate future */
+OggSyncErrorCode   <- mark_chunk_consumed(OggSyncReader *, char *)
+
+/* mark an absolute pos / size region as good for caching */
+OggSyncErrorCode   <- set_caching_hint(OggSyncReader *, int, int)
+
+-----------------------------------------------------------------------
+

Added: liboggsync/trunk/include/Makefile.am
===================================================================
--- liboggsync/trunk/include/Makefile.am	2006-06-26 14:19:09 UTC (rev 2344)
+++ liboggsync/trunk/include/Makefile.am	2006-06-30 01:42:14 UTC (rev 2345)
@@ -0,0 +1,3 @@
+## Process this file with automake to produce Makefile.in
+
+SUBDIRS = oggsync

Added: liboggsync/trunk/include/oggsync/Makefile.am
===================================================================
--- liboggsync/trunk/include/oggsync/Makefile.am	2006-06-26 14:19:09 UTC (rev 2344)
+++ liboggsync/trunk/include/oggsync/Makefile.am	2006-06-30 01:42:14 UTC (rev 2345)
@@ -0,0 +1,7 @@
+## Process this file with automake to produce Makefile.in
+
+# Include files to install
+includedir = $(prefix)/include/oggsync
+include_HEADERS = oggsync.h oggsync_enums.h oggsync_reader.h
+
+

Added: liboggsync/trunk/include/oggsync/oggsync.h
===================================================================
--- liboggsync/trunk/include/oggsync/oggsync.h	2006-06-26 14:19:09 UTC (rev 2344)
+++ liboggsync/trunk/include/oggsync/oggsync.h	2006-06-30 01:42:14 UTC (rev 2345)
@@ -0,0 +1,59 @@
+/*
+   Copyright (C) 2003 Commonwealth Scientific and Industrial Research
+   Organisation (CSIRO) Australia
+
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+
+   - Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+   - Neither the name of CSIRO Australia nor the names of its
+   contributors may be used to endorse or promote products derived from
+   this software without specific prior written permission.
+
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+   PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE ORGANISATION OR
+   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+/*
+ * oggsync.h
+ * 
+ * Shane Stephens <shane.stephens at annodex.net>
+ */
+
+#include <oggsync/oggsync_enums.h>
+#include <oggsync/oggsync_reader.h>
+//#include <oggsync/oggsync_query.h>
+//#include <oggsync/oggsync_retrieve.h>
+//#include <oggsync/oggsync_cmml.h>
+
+typedef struct _OggSync OggSync;
+
+OggSync *
+ogg_sync_init(void);
+
+OggSyncErrorCode
+ogg_sync_set_reader(OggSync *OS, OggSyncReader *OSR);
+
+OggSyncErrorCode
+ogg_sync_set_source(OggSync *OS, char *source);
+
+#ifndef __OGGSYNC_H__
+#define __OGGSYNC_H__
+
+#endif

Added: liboggsync/trunk/include/oggsync/oggsync_enums.h
===================================================================
--- liboggsync/trunk/include/oggsync/oggsync_enums.h	2006-06-26 14:19:09 UTC (rev 2344)
+++ liboggsync/trunk/include/oggsync/oggsync_enums.h	2006-06-30 01:42:14 UTC (rev 2345)
@@ -0,0 +1,49 @@
+/*
+   Copyright (C) 2003 Commonwealth Scientific and Industrial Research
+   Organisation (CSIRO) Australia
+
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+
+   - Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+   - Neither the name of CSIRO Australia nor the names of its
+   contributors may be used to endorse or promote products derived from
+   this software without specific prior written permission.
+
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+   PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE ORGANISATION OR
+   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+/*
+ * oggsync_enums.h
+ * 
+ * Shane Stephens <shane.stephens at annodex.net>
+ */
+
+#ifndef __OGGSYNC_ENUMS_H__
+#define __OGGSYNC_ENUMS_H__
+
+typedef enum OggSyncErrorCode {
+  E_OGGSYNC_OK = 0,
+  E_OGGSYNC_BAD_OGGSYNC = -1,
+  E_OGGSYNC_BAD_READER  = -2,
+  E_OGGSYNC_BAD_INPUT   = -3
+} OggSyncErrorCode;
+
+#endif

Added: liboggsync/trunk/include/oggsync/oggsync_reader.h
===================================================================
--- liboggsync/trunk/include/oggsync/oggsync_reader.h	2006-06-26 14:19:09 UTC (rev 2344)
+++ liboggsync/trunk/include/oggsync/oggsync_reader.h	2006-06-30 01:42:14 UTC (rev 2345)
@@ -0,0 +1,49 @@
+/*
+   Copyright (C) 2003 Commonwealth Scientific and Industrial Research
+   Organisation (CSIRO) Australia
+
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+
+   - Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+   - Neither the name of CSIRO Australia nor the names of its
+   contributors may be used to endorse or promote products derived from
+   this software without specific prior written permission.
+
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+   PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE ORGANISATION OR
+   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+/*
+ * oggsync_reader.h
+ * 
+ * Shane Stephens <shane.stephens at annodex.net>
+ */
+
+#ifndef __OGGSYNC_READER_H__
+#define __OGGSYNC_READER_H__
+
+struct _OggSyncReader;
+
+typedef struct _OggSyncReader {
+  OggSyncErrorCode  (*initialise)(struct _OggSyncReader * me);
+  OggSyncErrorCode  (*set_source)(struct _OggSyncReader * me, char * source);
+} OggSyncReader;
+
+#endif

Added: liboggsync/trunk/m4/as-ac-expand.m4
===================================================================
--- liboggsync/trunk/m4/as-ac-expand.m4	2006-06-26 14:19:09 UTC (rev 2344)
+++ liboggsync/trunk/m4/as-ac-expand.m4	2006-06-30 01:42:14 UTC (rev 2345)
@@ -0,0 +1,43 @@
+dnl as-ac-expand.m4 0.2.0
+dnl autostars m4 macro for expanding directories using configure's prefix
+dnl thomas at apestaart.org
+
+dnl AS_AC_EXPAND(VAR, CONFIGURE_VAR)
+dnl example
+dnl AS_AC_EXPAND(SYSCONFDIR, $sysconfdir)
+dnl will set SYSCONFDIR to /usr/local/etc if prefix=/usr/local
+
+AC_DEFUN([AS_AC_EXPAND],
+[
+  EXP_VAR=[$1]
+  FROM_VAR=[$2]
+
+  dnl first expand prefix and exec_prefix if necessary
+  prefix_save=$prefix
+  exec_prefix_save=$exec_prefix
+
+  dnl if no prefix given, then use /usr/local, the default prefix
+  if test "x$prefix" = "xNONE"; then
+    prefix="$ac_default_prefix"
+  fi
+  dnl if no exec_prefix given, then use prefix
+  if test "x$exec_prefix" = "xNONE"; then
+    exec_prefix=$prefix
+  fi
+
+  full_var="$FROM_VAR"
+  dnl loop until it doesn't change anymore
+  while true; do
+    new_full_var="`eval echo $full_var`"
+    if test "x$new_full_var" = "x$full_var"; then break; fi
+    full_var=$new_full_var
+  done
+
+  dnl clean up
+  full_var=$new_full_var
+  AC_SUBST([$1], "$full_var")
+
+  dnl restore prefix and exec_prefix
+  prefix=$prefix_save
+  exec_prefix=$exec_prefix_save
+])

Added: liboggsync/trunk/oggsync.pc.in
===================================================================
--- liboggsync/trunk/oggsync.pc.in	2006-06-26 14:19:09 UTC (rev 2344)
+++ liboggsync/trunk/oggsync.pc.in	2006-06-30 01:42:14 UTC (rev 2345)
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: oggsync
+Description: Decode from multiple ogg streams synchronously
+Requires:
+Version: @VERSION@
+Libs: -L${libdir} -loggsync 
+Cflags: -I${includedir}

Added: liboggsync/trunk/src/Makefile.am
===================================================================
--- liboggsync/trunk/src/Makefile.am	2006-06-26 14:19:09 UTC (rev 2344)
+++ liboggsync/trunk/src/Makefile.am	2006-06-30 01:42:14 UTC (rev 2345)
@@ -0,0 +1,4 @@
+## Process this file with automake to produce Makefile.in
+
+SUBDIRS = liboggsync
+

Added: liboggsync/trunk/src/liboggsync/.deps/oggsync.Plo
===================================================================
--- liboggsync/trunk/src/liboggsync/.deps/oggsync.Plo	2006-06-26 14:19:09 UTC (rev 2344)
+++ liboggsync/trunk/src/liboggsync/.deps/oggsync.Plo	2006-06-30 01:42:14 UTC (rev 2345)
@@ -0,0 +1,59 @@
+oggsync.lo oggsync.o: oggsync.c oggsync_private.h \
+  ../../include/oggsync/oggsync_enums.h \
+  ../../include/oggsync/oggsync_reader.h /usr/include/stdlib.h \
+  /usr/include/features.h /usr/include/sys/cdefs.h \
+  /usr/include/gnu/stubs.h \
+  /usr/lib/gcc/i486-linux-gnu/4.0.3/include/stddef.h \
+  /usr/include/sys/types.h /usr/include/bits/types.h \
+  /usr/include/bits/wordsize.h /usr/include/bits/typesizes.h \
+  /usr/include/time.h /usr/include/endian.h /usr/include/bits/endian.h \
+  /usr/include/sys/select.h /usr/include/bits/select.h \
+  /usr/include/bits/sigset.h /usr/include/bits/time.h \
+  /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h \
+  /usr/include/bits/sched.h /usr/include/alloca.h
+
+oggsync_private.h:
+
+../../include/oggsync/oggsync_enums.h:
+
+../../include/oggsync/oggsync_reader.h:
+
+/usr/include/stdlib.h:
+
+/usr/include/features.h:
+
+/usr/include/sys/cdefs.h:
+
+/usr/include/gnu/stubs.h:
+
+/usr/lib/gcc/i486-linux-gnu/4.0.3/include/stddef.h:
+
+/usr/include/sys/types.h:
+
+/usr/include/bits/types.h:
+
+/usr/include/bits/wordsize.h:
+
+/usr/include/bits/typesizes.h:
+
+/usr/include/time.h:
+
+/usr/include/endian.h:
+
+/usr/include/bits/endian.h:
+
+/usr/include/sys/select.h:
+
+/usr/include/bits/select.h:
+
+/usr/include/bits/sigset.h:
+
+/usr/include/bits/time.h:
+
+/usr/include/sys/sysmacros.h:
+
+/usr/include/bits/pthreadtypes.h:
+
+/usr/include/bits/sched.h:
+
+/usr/include/alloca.h:

Added: liboggsync/trunk/src/liboggsync/Makefile.am
===================================================================
--- liboggsync/trunk/src/liboggsync/Makefile.am	2006-06-26 14:19:09 UTC (rev 2344)
+++ liboggsync/trunk/src/liboggsync/Makefile.am	2006-06-30 01:42:14 UTC (rev 2345)
@@ -0,0 +1,18 @@
+## Process this file with automake to produce Makefile.in
+
+AM_CFLAGS = -Wall -pedantic
+
+INCLUDES = $(INCLTDL) -I$(top_srcdir)/include
+
+EXTRA_DIST = Version_script.in
+
+# Libraries to build
+lib_LTLIBRARIES = liboggsync.la
+
+noinst_headers = \
+	oggsync_private.h
+
+liboggsync_la_SOURCES = \
+	oggsync.c
+
+liboggsync_la_LDFLAGS = -version-info @SHARED_VERSION_INFO@ @SHLIB_VERSION_ARG@

Added: liboggsync/trunk/src/liboggsync/Version_script.in
===================================================================
--- liboggsync/trunk/src/liboggsync/Version_script.in	2006-06-26 14:19:09 UTC (rev 2344)
+++ liboggsync/trunk/src/liboggsync/Version_script.in	2006-06-30 01:42:14 UTC (rev 2345)
@@ -0,0 +1,17 @@
+#
+# Export file for liboggsync
+#
+# Only the symbols listed in the global section will be callable from
+# applications linking to liboggsync.
+#
+
+ at PACKAGE@.so
+{
+        global:
+                ogg_sync_init;
+                ogg_sync_set_reader;
+                ogg_sync_set_source;
+  
+        local:
+                *;
+};

Added: liboggsync/trunk/src/liboggsync/oggsync.c
===================================================================
--- liboggsync/trunk/src/liboggsync/oggsync.c	2006-06-26 14:19:09 UTC (rev 2344)
+++ liboggsync/trunk/src/liboggsync/oggsync.c	2006-06-30 01:42:14 UTC (rev 2345)
@@ -0,0 +1,100 @@
+/*
+   Copyright (C) 2003 Commonwealth Scientific and Industrial Research
+   Organisation (CSIRO) Australia
+
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+
+   - Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+   - Neither the name of CSIRO Australia nor the names of its
+   contributors may be used to endorse or promote products derived from
+   this software without specific prior written permission.
+
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+   PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE ORGANISATION OR
+   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+/*
+ * oggsync.c
+ * 
+ * Shane Stephens <shane.stephens at annodex.net>
+ */
+
+#include "oggsync_private.h"
+
+#include <stdlib.h>
+
+OggSync *
+ogg_sync_init(void) {
+
+  OggSync *me = malloc(sizeof(OggSync));
+  me->reader = NULL;
+  me->input_name = NULL;
+
+  return me;
+
+}
+
+OggSyncErrorCode
+ogg_sync_set_reader (OggSync * me, OggSyncReader * reader) {
+
+  OggSyncErrorCode return_val;
+  
+  if (me == NULL) {
+    return E_OGGSYNC_BAD_OGGSYNC;
+  }
+
+  if (reader == NULL) {
+    return E_OGGSYNC_BAD_READER;
+  }
+
+  return_val = reader->initialise(reader);
+
+  if (return_val == E_OGGSYNC_OK) {
+    me->reader = reader;
+  }
+  
+  return return_val;
+}
+
+OggSyncErrorCode
+ogg_sync_set_source (OggSync * me, char * input_name) {
+
+  OggSyncErrorCode return_val;
+  
+  if (me == NULL) {
+    return E_OGGSYNC_BAD_OGGSYNC;
+  }
+
+  if (me->reader == NULL) {
+    return E_OGGSYNC_BAD_READER;
+  }
+
+  if (me->input_name == NULL) {
+    return E_OGGSYNC_BAD_INPUT;
+  }
+ 
+  return_val = me->reader->set_source(me->reader, input_name);
+
+  if (return_val == E_OGGSYNC_OK) {
+    me->input_name = input_name;
+  }
+
+  return return_val;
+}

Added: liboggsync/trunk/src/liboggsync/oggsync_private.h
===================================================================
--- liboggsync/trunk/src/liboggsync/oggsync_private.h	2006-06-26 14:19:09 UTC (rev 2344)
+++ liboggsync/trunk/src/liboggsync/oggsync_private.h	2006-06-30 01:42:14 UTC (rev 2345)
@@ -0,0 +1,49 @@
+/*
+   Copyright (C) 2003 Commonwealth Scientific and Industrial Research
+   Organisation (CSIRO) Australia
+
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+
+   - Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+   - Neither the name of CSIRO Australia nor the names of its
+   contributors may be used to endorse or promote products derived from
+   this software without specific prior written permission.
+
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+   PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE ORGANISATION OR
+   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+/*
+ * oggsync_private.h
+ * 
+ * Shane Stephens <shane.stephens at annodex.net>
+ */
+#ifndef __OGGSYNC_PRIVATE_H__
+#define __OGGSYNC_PRIVATE_H__
+
+#include <oggsync/oggsync_enums.h>
+#include <oggsync/oggsync_reader.h>
+
+typedef struct _OggSync {
+  OggSyncReader * reader;
+  char          * input_name;
+} OggSync;
+
+#endif


-- 
shans

