Changeset 3743

Timestamp:

2008-10-27 01:45:09 (2 months ago)

Author:

conrad

Message:

anx_import_ogg: cleanup: create anx_ogg_packet_new() util function, use
in reader, and pull anx_ogg_packet_free() to top of file

Files:

• libannodex/trunk/src/importers/anx_import_ogg.c (modified) (3 diffs)

libannodex/trunk/src/importers/anx_import_ogg.c

@@ -276 +276 @@
-  ret = anx_malloc (strlen (s) + 1);
-  return strcpy (ret, s);
+}
+
+static AnxOggPacket *
+anxogg_packet_new (ogg_packet * op, AnxSourceTrack * source_track,
+                   double current_time)
+{
+  AnxOggPacket * aop;
+
+  aop = anx_malloc (sizeof (AnxOggPacket));
+  aop->length = op->bytes;
+  aop->data = anx_malloc (op->bytes);
+  aop->granulepos = op->granulepos;
+  aop->current_time = current_time;
+  aop->source_track = source_track;
+  aop->eos = op->e_o_s;
+
+  return aop;
+}
+
+static AnxOggPacket *
+anxogg_packet_free (AnxOggPacket * aop)
+{
+  anx_free (aop->data);
+  anx_free (aop);
+  return NULL;
-}
-
@@ -1084 +1109 @@
-    fprintf (aod->df, "anxogg::read_packet_data: no, copy out\n");
-#endif
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-    memcpy (aop->data, op->packet, op->bytes);
-    
@@ -1133 +1147 @@
-
-  return OGGZ_STOP_OK;
-}
-
-static AnxOggPacket *
-anxogg_packet_free (AnxOggPacket * aop)
-{
-  anx_free (aop->data);
-  anx_free (aop);
-  return NULL;
-}
-