[xiph-commits] r3390 - liboggz/trunk/src/liboggz
conrad at svn.annodex.net
conrad at svn.annodex.net
Mon Jan 28 19:39:27 PST 2008
Author: conrad
Date: 2008-01-28 19:39:26 -0800 (Mon, 28 Jan 2008)
New Revision: 3390
Added:
liboggz/trunk/src/liboggz/oggz_stream_private.h
Removed:
liboggz/trunk/src/liboggz/oggz_stream.h
Modified:
liboggz/trunk/src/liboggz/oggz_auto.c
liboggz/trunk/src/liboggz/oggz_private.h
Log:
rename internal oggz_stream.h to oggz_stream_private.h
Modified: liboggz/trunk/src/liboggz/oggz_auto.c
===================================================================
--- liboggz/trunk/src/liboggz/oggz_auto.c 2008-01-29 03:37:38 UTC (rev 3389)
+++ liboggz/trunk/src/liboggz/oggz_auto.c 2008-01-29 03:39:26 UTC (rev 3390)
@@ -44,6 +44,8 @@
#include "oggz_private.h"
#include "oggz_byteorder.h"
+#include <oggz/oggz_stream.h>
+
/*#define DEBUG*/
/* Allow use of internal metrics; ie. the user_data for these gets free'd
Modified: liboggz/trunk/src/liboggz/oggz_private.h
===================================================================
--- liboggz/trunk/src/liboggz/oggz_private.h 2008-01-29 03:37:38 UTC (rev 3389)
+++ liboggz/trunk/src/liboggz/oggz_private.h 2008-01-29 03:39:26 UTC (rev 3390)
@@ -57,7 +57,7 @@
void * user_data);
/* oggz_stream */
-#include "oggz_stream.h"
+#include "oggz_stream_private.h"
typedef ogg_int64_t (*OggzMetric) (OGGZ * oggz, long serialno,
ogg_int64_t granulepos,
Deleted: liboggz/trunk/src/liboggz/oggz_stream.h
===================================================================
--- liboggz/trunk/src/liboggz/oggz_stream.h 2008-01-29 03:37:38 UTC (rev 3389)
+++ liboggz/trunk/src/liboggz/oggz_stream.h 2008-01-29 03:39:26 UTC (rev 3390)
@@ -1,68 +0,0 @@
-/*
- 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.
-*/
-
-#ifndef __OGGZ_STREAM_PRIVATE_H__
-#define __OGGZ_STREAM_PRIVATE_H__
-
-typedef struct _oggz_stream_t oggz_stream_t;
-
-typedef struct {
- const char *bos_str;
- int bos_str_len;
- const char *content_type;
- OggzReadPacket reader;
- ogg_int64_t (*calculator)(ogg_int64_t now, oggz_stream_t *stream,
- ogg_packet *op);
- ogg_int64_t (*r_calculator)(ogg_int64_t next_packet_gp,
- oggz_stream_t *stream, ogg_packet *this_packet,
- ogg_packet *next_packet);
-} oggz_auto_contenttype_t;
-
-extern const oggz_auto_contenttype_t oggz_auto_codec_ident[];
-
-
-oggz_stream_t * oggz_get_stream (OGGZ * oggz, long serialno);
-oggz_stream_t * oggz_add_stream (OGGZ * oggz, long serialno);
-
-int oggz_stream_has_metric (OGGZ * oggz, long serialno);
-int oggz_stream_set_content (OGGZ * oggz, long serialno, int content);
-OggzStreamContent oggz_stream_get_content (OGGZ * oggz, long serialno);
-const char * oggz_stream_get_content_type (OGGZ *oggz, long serialno);
-ogg_int64_t
-oggz_auto_calculate_granulepos(int content, ogg_int64_t now,
- oggz_stream_t *stream, ogg_packet *op);
-
-ogg_int64_t
-oggz_auto_calculate_gp_backwards(int content, ogg_int64_t next_packet_gp,
- oggz_stream_t *stream, ogg_packet *this_packet, ogg_packet *next_packet);
-
-#endif /* __OGGZ_STREAM_PRIVATE_H__ */
Copied: liboggz/trunk/src/liboggz/oggz_stream_private.h (from rev 3389, liboggz/trunk/src/liboggz/oggz_stream.h)
===================================================================
--- liboggz/trunk/src/liboggz/oggz_stream_private.h (rev 0)
+++ liboggz/trunk/src/liboggz/oggz_stream_private.h 2008-01-29 03:39:26 UTC (rev 3390)
@@ -0,0 +1,68 @@
+/*
+ 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.
+*/
+
+#ifndef __OGGZ_STREAM_PRIVATE_H__
+#define __OGGZ_STREAM_PRIVATE_H__
+
+typedef struct _oggz_stream_t oggz_stream_t;
+
+typedef struct {
+ const char *bos_str;
+ int bos_str_len;
+ const char *content_type;
+ OggzReadPacket reader;
+ ogg_int64_t (*calculator)(ogg_int64_t now, oggz_stream_t *stream,
+ ogg_packet *op);
+ ogg_int64_t (*r_calculator)(ogg_int64_t next_packet_gp,
+ oggz_stream_t *stream, ogg_packet *this_packet,
+ ogg_packet *next_packet);
+} oggz_auto_contenttype_t;
+
+extern const oggz_auto_contenttype_t oggz_auto_codec_ident[];
+
+
+oggz_stream_t * oggz_get_stream (OGGZ * oggz, long serialno);
+oggz_stream_t * oggz_add_stream (OGGZ * oggz, long serialno);
+
+int oggz_stream_has_metric (OGGZ * oggz, long serialno);
+int oggz_stream_set_content (OGGZ * oggz, long serialno, int content);
+OggzStreamContent oggz_stream_get_content (OGGZ * oggz, long serialno);
+const char * oggz_stream_get_content_type (OGGZ *oggz, long serialno);
+ogg_int64_t
+oggz_auto_calculate_granulepos(int content, ogg_int64_t now,
+ oggz_stream_t *stream, ogg_packet *op);
+
+ogg_int64_t
+oggz_auto_calculate_gp_backwards(int content, ogg_int64_t next_packet_gp,
+ oggz_stream_t *stream, ogg_packet *this_packet, ogg_packet *next_packet);
+
+#endif /* __OGGZ_STREAM_PRIVATE_H__ */
More information about the commits
mailing list