[cvs-annodex] commit (/annodex):
libannodex/trunk/src/libannodex/annodex.c
libannodex/trunk/src/libannodex/anx_command.c
libannodex/trunk/src/libannodex/anx_private.h
libannodex/trunk/src/libannodex/anx_read.c
libannodex/trunk/src/libannodex/anx_track.c
libannodex/trunk/src/libannodex/anx_write.c
conrad
nobody at lists.annodex.net
Fri Feb 11 15:54:22 EST 2005
Update of /annodex (new revision 878)
Modified files:
libannodex/trunk/src/libannodex/annodex.c
libannodex/trunk/src/libannodex/anx_command.c
libannodex/trunk/src/libannodex/anx_private.h
libannodex/trunk/src/libannodex/anx_read.c
libannodex/trunk/src/libannodex/anx_track.c
libannodex/trunk/src/libannodex/anx_write.c
Log Message:
code cleanups -- rename a bunch of anno_* variables to cmml_*
Modified: libannodex/trunk/src/libannodex/annodex.c
===================================================================
--- libannodex/trunk/src/libannodex/annodex.c 2005-02-11 03:52:56 UTC (rev 877)
+++ libannodex/trunk/src/libannodex/annodex.c 2005-02-11 04:54:16 UTC (rev 878)
@@ -83,7 +83,7 @@
annodex->pending_command = NULL;
annodex->mapping_serialno_valid = 0;
- annodex->anno_serialno_valid = 0;
+ annodex->cmml_serialno_valid = 0;
switch (flags) {
case ANX_READ:
Modified: libannodex/trunk/src/libannodex/anx_command.c
===================================================================
--- libannodex/trunk/src/libannodex/anx_command.c 2005-02-11 03:52:56 UTC (rev 877)
+++ libannodex/trunk/src/libannodex/anx_command.c 2005-02-11 04:54:16 UTC (rev 878)
@@ -304,7 +304,7 @@
anx_tree_insert (annodex, annodex->commands, command);
anx_commands_fix_type (annodex, command->type);
- current_offset = anx_track_granules_to_time (annodex, annodex->anno_serialno,
+ current_offset = anx_track_granules_to_time (annodex, annodex->cmml_serialno,
anx_tell (annodex));
pending_offset =
anx_command_get_time_offset (annodex, annodex->pending_command);
@@ -475,7 +475,7 @@
anx_tree_remove (annodex, annodex->commands, command);
anx_commands_fix_type (annodex, type);
- current_offset = anx_track_granules_to_time (annodex, annodex->anno_serialno,
+ current_offset = anx_track_granules_to_time (annodex, annodex->cmml_serialno,
anx_tell (annodex));
anx_command_seek (annodex, current_offset);
Modified: libannodex/trunk/src/libannodex/anx_private.h
===================================================================
--- libannodex/trunk/src/libannodex/anx_private.h 2005-02-11 03:52:56 UTC (rev 877)
+++ libannodex/trunk/src/libannodex/anx_private.h 2005-02-11 04:54:16 UTC (rev 878)
@@ -102,7 +102,7 @@
int need_fishead;
int need_bos;
int need_fisbone;
- int need_anno_fisbone;
+ int need_cmml_fisbone;
int need_cmml_bos;
int need_cmml_preamble;
int need_head;
@@ -110,10 +110,10 @@
int secondary_headers_remaining;
int done_media;
- int done_anno_eos;
+ int done_cmml_eos;
int done_eos;
- AnxTrack anno_track;
+ AnxTrack cmml_track;
ogg_stream_state mapping_stream;
ogg_stream_state annotations_stream;
@@ -132,8 +132,8 @@
AnxImportImport import_import_callback;
void * import_import_user_data;
- char * anno_buf;
- long anno_buf_len, anno_buf_n;
+ char * cmml_buf;
+ long cmml_buf_len, cmml_buf_n;
unsigned char * media_buf;
long media_buf_len, media_buf_n;
@@ -189,8 +189,8 @@
int mapping_serialno_valid; /* is mapping_serialno valid? */
long mapping_serialno; /* serialno of mapping */
- int anno_serialno_valid; /* is anno_serialno valid? */
- long anno_serialno; /* serialno of annotations stream */
+ int cmml_serialno_valid; /* is cmml_serialno valid? */
+ long cmml_serialno; /* serialno of annotations stream */
union {
AnxReader reader;
Modified: libannodex/trunk/src/libannodex/anx_read.c
===================================================================
--- libannodex/trunk/src/libannodex/anx_read.c 2005-02-11 03:52:56 UTC (rev 877)
+++ libannodex/trunk/src/libannodex/anx_read.c 2005-02-11 04:54:16 UTC (rev 878)
@@ -362,13 +362,13 @@
}
#endif
- if (annodex->anno_serialno_valid == 0 && content_type &&
+ if (annodex->cmml_serialno_valid == 0 && content_type &&
!strncmp (content_type, "text/x-cmml", 15)) {
#ifdef DEBUG
printf ("Got anno track %010ld\n", track->serialno);
#endif
- annodex->anno_serialno_valid = 1;
- annodex->anno_serialno = track->serialno;
+ annodex->cmml_serialno_valid = 1;
+ annodex->cmml_serialno = track->serialno;
}
return cb_ret;
@@ -458,13 +458,13 @@
}
#endif
- if (annodex->anno_serialno_valid == 0 && content_type &&
+ if (annodex->cmml_serialno_valid == 0 && content_type &&
!strncmp (content_type, "text/x-cmml", 15)) {
#ifdef DEBUG
printf ("Got anno track %010ld\n", serialno);
#endif
- annodex->anno_serialno_valid = 1;
- annodex->anno_serialno = serialno;
+ annodex->cmml_serialno_valid = 1;
+ annodex->cmml_serialno = serialno;
}
return cb_ret;
@@ -530,8 +530,8 @@
} else if (op->bytes > 6 &&
!strncmp ((char *)op->packet, "CMML", 4)) {
/* CMML */
- annodex->anno_serialno = serialno;
- annodex->anno_serialno_valid = 1;
+ annodex->cmml_serialno = serialno;
+ annodex->cmml_serialno_valid = 1;
} else if (op->e_o_s && annodex->mapping_serialno_valid &&
serialno == annodex->mapping_serialno &&
reader->got_non_init == 0) {
@@ -568,14 +568,14 @@
return 0;
}
- if (annodex->anno_serialno_valid == 0) {
+ if (annodex->cmml_serialno_valid == 0) {
#ifdef DEBUG
printf ("\tread_packet: anno serialno invalid -- breaking out\n");
#endif
return 0;
}
- if (serialno == annodex->anno_serialno) {
+ if (serialno == annodex->cmml_serialno) {
#ifdef DEBUG
printf ("anx_read_packet: delivering clip (%ld) length %ld\n",
Modified: libannodex/trunk/src/libannodex/anx_track.c
===================================================================
--- libannodex/trunk/src/libannodex/anx_track.c 2005-02-11 03:52:56 UTC (rev 877)
+++ libannodex/trunk/src/libannodex/anx_track.c 2005-02-11 04:54:16 UTC (rev 878)
@@ -92,8 +92,8 @@
if (annodex->flags == ANX_READ) {
l = reader->tracks;
} else {
- if (serialno == annodex->anno_serialno) {
- return &writer->anno_track;
+ if (serialno == annodex->cmml_serialno) {
+ return &writer->cmml_track;
}
l = writer->tracks;
Modified: libannodex/trunk/src/libannodex/anx_write.c
===================================================================
--- libannodex/trunk/src/libannodex/anx_write.c 2005-02-11 03:52:56 UTC (rev 877)
+++ libannodex/trunk/src/libannodex/anx_write.c 2005-02-11 04:54:16 UTC (rev 878)
@@ -707,7 +707,7 @@
b += 8;
return anx_packet_init (annodex, buf, CMML_HEADER_SIZE,
- annodex->anno_serialno,
+ annodex->cmml_serialno,
0 /* granulepos */, 1 /* bos */, 0 /* eos */,
OGGZ_FLUSH_AFTER);
}
@@ -717,7 +717,7 @@
{
return anx_packet_init (annodex, (unsigned char *)CMML_PREAMBLE,
strlen (CMML_PREAMBLE),
- annodex->anno_serialno,
+ annodex->cmml_serialno,
0 /* granulepos */, 0 /* bos */, 0 /* eos */,
OGGZ_FLUSH_AFTER);
}
@@ -730,17 +730,17 @@
input_n = (long)anx_head_snprint (NULL, 0, annodex->head);
- if (input_n > writer->anno_buf_len) {
- writer->anno_buf = realloc (writer->anno_buf, input_n);
- writer->anno_buf_len = input_n;
+ if (input_n > writer->cmml_buf_len) {
+ writer->cmml_buf = realloc (writer->cmml_buf, input_n);
+ writer->cmml_buf_len = input_n;
}
input_n =
- (long)anx_head_snprint (writer->anno_buf, writer->anno_buf_len,
+ (long)anx_head_snprint (writer->cmml_buf, writer->cmml_buf_len,
annodex->head);
- return anx_packet_init (annodex, (unsigned char *)writer->anno_buf, input_n,
- annodex->anno_serialno, 0 /* granulepos */,
+ return anx_packet_init (annodex, (unsigned char *)writer->cmml_buf, input_n,
+ annodex->cmml_serialno, 0 /* granulepos */,
0 /* bos */, 0 /* eos */,
OGGZ_FLUSH_AFTER);
}
@@ -749,7 +749,7 @@
anx_init_clip_packet (ANNODEX * annodex)
{
AnxWriter * writer = &annodex->x.writer;
- AnxTrack * track = &writer->anno_track;
+ AnxTrack * track = &writer->cmml_track;
AnxCommand command;
AnxCommandData data;
double command_time;
@@ -768,18 +768,18 @@
input_n = (long)anx_clip_snprint (NULL, 0, data.clip, -1.0, -1.0);
- if (input_n > writer->anno_buf_len) {
- writer->anno_buf = realloc (writer->anno_buf, input_n);
- writer->anno_buf_len = input_n;
+ if (input_n > writer->cmml_buf_len) {
+ writer->cmml_buf = realloc (writer->cmml_buf, input_n);
+ writer->cmml_buf_len = input_n;
}
input_n =
- (long)anx_clip_snprint (writer->anno_buf, writer->anno_buf_len,
+ (long)anx_clip_snprint (writer->cmml_buf, writer->cmml_buf_len,
data.clip, -1.0, -1.0);
}
- return anx_packet_init (annodex, (unsigned char *)writer->anno_buf, input_n,
- annodex->anno_serialno, granulepos,
+ return anx_packet_init (annodex, (unsigned char *)writer->cmml_buf, input_n,
+ annodex->cmml_serialno, granulepos,
0 /* bos */, 0 /* eos */,
OGGZ_FLUSH_AFTER);
}
@@ -788,7 +788,7 @@
anx_init_clear_clip_packet (ANNODEX * annodex)
{
AnxWriter * writer = &annodex->x.writer;
- AnxTrack * track = &writer->anno_track;
+ AnxTrack * track = &writer->cmml_track;
AnxCommand command;
double command_time;
anx_int64_t granulepos;
@@ -803,15 +803,15 @@
input_n = (long) strlen (CMML_EMPTY_CLIP);
- if (input_n > writer->anno_buf_len) {
- writer->anno_buf = realloc (writer->anno_buf, input_n);
- writer->anno_buf_len = input_n;
+ if (input_n > writer->cmml_buf_len) {
+ writer->cmml_buf = realloc (writer->cmml_buf, input_n);
+ writer->cmml_buf_len = input_n;
}
- input_n = snprintf (writer->anno_buf, writer->anno_buf_len, CMML_EMPTY_CLIP);
+ input_n = snprintf (writer->cmml_buf, writer->cmml_buf_len, CMML_EMPTY_CLIP);
- return anx_packet_init (annodex, (unsigned char *)writer->anno_buf, input_n,
- annodex->anno_serialno, granulepos,
+ return anx_packet_init (annodex, (unsigned char *)writer->cmml_buf, input_n,
+ annodex->cmml_serialno, granulepos,
0 /* bos */, 0 /* eos */,
OGGZ_FLUSH_AFTER);
}
@@ -989,14 +989,14 @@
anx_init_clip_eos_packet (ANNODEX * annodex)
{
AnxWriter * writer = &annodex->x.writer;
- AnxTrack * track = &writer->anno_track;
+ AnxTrack * track = &writer->cmml_track;
anx_int64_t granulepos;
granulepos = (anx_int64_t)(anx_tell_time (annodex) *
track->granule_rate_n /
track->granule_rate_d);
- return anx_init_eos_packet (annodex, annodex->anno_serialno, granulepos);
+ return anx_init_eos_packet (annodex, annodex->cmml_serialno, granulepos);
}
@@ -1069,12 +1069,12 @@
#endif
writer->need_bos = 0;
}
- } else if (writer->need_anno_fisbone) {
+ } else if (writer->need_cmml_fisbone) {
#ifdef DEBUG
printf ("anx_writer_sync: NEED CMML fisbone\n");
#endif
- anx_init_fisbone_packet (annodex, &writer->anno_track);
- writer->need_anno_fisbone = 0;
+ anx_init_fisbone_packet (annodex, &writer->cmml_track);
+ writer->need_cmml_fisbone = 0;
made_packet = 1;
} else if (writer->need_fisbone) {
#ifdef DEBUG
@@ -1234,9 +1234,9 @@
#ifdef DEBUG
printf ("anx_writer_sync: writer->done_media\n");
#endif
- if (!writer->done_anno_eos) {
+ if (!writer->done_cmml_eos) {
anx_init_clip_eos_packet (annodex);
- writer->done_anno_eos = 1;
+ writer->done_cmml_eos = 1;
made_packet = 1;
} else {
for (l = writer->tracks; l; l = l->next) {
@@ -1306,7 +1306,7 @@
writer->need_fishead = 1;
writer->need_bos = 1;
writer->need_fisbone = 1;
- writer->need_anno_fisbone = 1;
+ writer->need_cmml_fisbone = 1;
writer->need_cmml_bos = 1;
writer->need_cmml_preamble = 1;
writer->need_head = 1;
@@ -1314,7 +1314,7 @@
writer->secondary_headers_remaining = 0;
writer->done_media = 0;
- writer->done_anno_eos = 0;
+ writer->done_cmml_eos = 0;
writer->done_eos = 0;
/* Initialise the commands list */
@@ -1327,21 +1327,21 @@
annodex->mapping_serialno = random ();
annodex->mapping_serialno_valid = 1;
- annodex->anno_serialno = random ();
- annodex->anno_serialno_valid = 1;
+ annodex->cmml_serialno = random ();
+ annodex->cmml_serialno_valid = 1;
writer->medias = NULL;
writer->tracks = NULL;
- writer->anno_track.serialno = annodex->anno_serialno;
- writer->anno_track.id = NULL;
- writer->anno_track.content_type = cmml_content_type;
- writer->anno_track.nr_header_packets = 2;
- writer->anno_track.granule_rate_n = CMML_GRANULE_RATE_N;
- writer->anno_track.granule_rate_d = CMML_GRANULE_RATE_D;
- writer->anno_track.basegranule = 0;
- writer->anno_track.preroll = 0;
- writer->anno_track.granuleshift = 0;
+ writer->cmml_track.serialno = annodex->cmml_serialno;
+ writer->cmml_track.id = NULL;
+ writer->cmml_track.content_type = cmml_content_type;
+ writer->cmml_track.nr_header_packets = 2;
+ writer->cmml_track.granule_rate_n = CMML_GRANULE_RATE_N;
+ writer->cmml_track.granule_rate_d = CMML_GRANULE_RATE_D;
+ writer->cmml_track.basegranule = 0;
+ writer->cmml_track.preroll = 0;
+ writer->cmml_track.granuleshift = 0;
writer->eos = 0; /* end of stream */
@@ -1354,8 +1354,8 @@
writer->import_import_callback = anx_import_import_default;
writer->import_import_user_data = annodex;
- writer->anno_buf = anx_malloc (102400);
- writer->anno_buf_len = 102400;
+ writer->cmml_buf = anx_malloc (102400);
+ writer->cmml_buf_len = 102400;
writer->media_buf = anx_malloc (102400);
writer->media_buf_len = 102400;
@@ -1457,7 +1457,7 @@
}
int
-anx_write_set_anno_callbacks (ANNODEX * annodex,
+anx_write_set_cmml_callbacks (ANNODEX * annodex,
AnxImportHead import_head_callback,
AnxImportClip import_clip_callback,
AnxImportCMML import_cmml_callback,
--
conrad
More information about the cvs-annodex
mailing list