Changeset 3788

Timestamp:

2008-11-17 11:59:19 (2 months ago)

Author:

giles

Message:

Clean up some trailing whitespace.

Files:

• liboggz/trunk/src/liboggz/oggz_read.c (modified) (12 diffs)
• liboggz/trunk/src/liboggz/oggz_write.c (modified) (3 diffs)

liboggz/trunk/src/liboggz/oggz_read.c

@@ -251 +251 @@
-
-OggzBufferedPacket *
- 
- 
+
+
-            OggzReader *reader) {
-
@@ -271 +271 @@
-void
-oggz_read_free_pbuffer_entry(OggzBufferedPacket *p) {
-
+
-  free(p->packet.packet);
-  free(p);
@@ -284 +284 @@
-  if (p->calced_granulepos == -1 && p->stream->last_granulepos != -1) {
-    int content = oggz_stream_get_content(p->oggz, p->serialno);
- 
+
-      oggz_auto_calculate_gp_backwards(content, p->stream->last_granulepos,
-      p->stream, &(p->packet), p->stream->last_packet);
-
+
-    p->stream->last_granulepos = p->calced_granulepos;
-    p->stream->last_packet = &(p->packet);
@@ -316 +316 @@
-
-  if (p->stream->read_packet) {
- 
+
-            p->stream->read_user_data);
-  } else if (p->reader->read_packet) {
- 
+
-            p->reader->read_user_data);
-  }
@@ -405 +405 @@
-
-          stream->packetno++;
-
+
-          /* got a packet.  process it */
-          granulepos = op->granulepos;
-
-          content = oggz_stream_get_content(oggz, serialno);
-
+
-          /*
-           * if we have no metrics for this stream yet, then generate them
-      
- 
+
+
-          (
- 
- 
+
+
-            (oggz->flags & OGGZ_AUTO)
- 
+
-          {
-            oggz_auto_read_bos_packet (oggz, op, serialno, NULL);
@@ -426 +426 @@
-          /* attempt to determine granulepos for this packet */
-          if (oggz->flags & OGGZ_AUTO) {
- 
- 
+
+
-            /* make sure that we accept any "real" gaps in the granulepos
-             */
@@ -437 +437 @@
-          }
-          stream->last_granulepos = reader->current_granulepos;
-
+
-          /* set unit on last packet of page */
- 
+
-          (
-            (oggz->metric || stream->metric) && reader->current_granulepos != -1
- 
+
-          {
-            reader->current_unit =
@@ -451 +451 @@
-            oggz_auto_read_comments (oggz, stream, serialno, op);
-          }
-
+
-          if (oggz->flags & OGGZ_AUTO) {
-
+
-            /*
- 
+
-             * incoming packets in a dlist */
-            if (reader->current_granulepos == -1) {
-              OggzBufferedPacket *p = oggz_read_new_pbuffer_entry(
- 
+
-                                serialno, stream, reader);
-
@@ -477 +477 @@
-
-              /*
- 
+
-               */
-              stream->last_granulepos = gp_stored;
@@ -483 +483 @@
-              if (!oggz_dlist_is_empty(oggz->packet_buffer)) {
-                OggzBufferedPacket *p = oggz_read_new_pbuffer_entry(
- 
+
-                                serialno, stream, reader);
-
@@ -543 +543 @@
-      oggz_auto_identify_page (oggz, &og, serialno);
-    }
-
+
-    os = &stream->ogg_stream;
-
@@ -629 +629 @@
-    if (bytes_read > 0) {
-      ogg_sync_wrote (&reader->ogg_sync, bytes_read);
-
+
-      remaining -= bytes_read;
-      nread += bytes_read;
-
+
-      cb_ret = oggz_read_sync (oggz);
-    }

liboggz/trunk/src/liboggz/oggz_write.c

@@ -657 +657 @@
-  printf("oggz_writer_make_packet: cb_ret is %d\n", cb_ret);
-#endif
-
+
-  if (cb_ret == 0 && next_zpacket == NULL) return OGGZ_WRITE_EMPTY;
-
@@ -671 +671 @@
-
-  if (oggz == NULL) return OGGZ_ERR_BAD_OGGZ;
-
+
-  writer = &oggz->x.writer;
-
@@ -823 +823 @@
-         * we can't finish just yet.  Instead we need to force a page flush,
-         * and write the page out.  So we set flushing and no_more_packets to
- 
+
-         * will switch the state to OGGZ_WRITING_PAGES, which will trigger
-         * the writing code below.