[xiph-commits] r3044 - in liboggplay/trunk/src: liboggplay tools

[shans at svn.annodex.net]

Author: shans
Date: 2007-06-25 04:05:31 -0700 (Mon, 25 Jun 2007)
New Revision: 3044

Modified:
   liboggplay/trunk/src/liboggplay/oggplay.c
   liboggplay/trunk/src/liboggplay/oggplay_tcp_reader.c
   liboggplay/trunk/src/tools/glut-player.c
Log:
Don't need to check for space any more - our semaphore does that!
Removed some printfs



Modified: liboggplay/trunk/src/liboggplay/oggplay.c
===================================================================
--- liboggplay/trunk/src/liboggplay/oggplay.c	2007-06-25 10:24:53 UTC (rev 3043)
+++ liboggplay/trunk/src/liboggplay/oggplay.c	2007-06-25 11:05:31 UTC (rev 3044)
@@ -385,13 +385,6 @@
     me->trash = NULL;
   }
 
-  /*
-   * make sure the buffer has actually got some space
-   */
-  if ((me->buffer != NULL) && oggplay_buffer_is_full(me->buffer)) {
-    return E_OGGPLAY_USER_INTERRUPT;
-  }
- 
 read_more_data:
 
   while (1) {

Modified: liboggplay/trunk/src/liboggplay/oggplay_tcp_reader.c
===================================================================
--- liboggplay/trunk/src/liboggplay/oggplay_tcp_reader.c	2007-06-25 10:24:53 UTC (rev 3043)
+++ liboggplay/trunk/src/liboggplay/oggplay_tcp_reader.c	2007-06-25 11:05:31 UTC (rev 3044)
@@ -206,7 +206,6 @@
     strncpy(host, _location, path - _location);
     host[path - _location] = '\0';
   }
-  printf("host: %s, path: %s\n", host, path);
 
   /*
    * Prepare the HTTP request header now, so we can free all our
@@ -330,7 +329,6 @@
         return E_OGGPLAY_END_OF_FILE;
       }
       me->buffer[me->amount_in_memory + nbytes] = '\0';
-      printf("%s\n",me->buffer);
       pos = strstr((char *)(me->buffer), "OggS");
       if (pos != NULL) {
         break;
@@ -539,7 +537,6 @@
   me->amount_in_memory = 0;
   me->backing_store = NULL;
   me->stored_offset = 0;
-  me->mode = TCP_READER_FROM_MEMORY;
 
   me->functions.initialise = &oggplay_tcp_reader_initialise;
   me->functions.destroy = &oggplay_tcp_reader_destroy;

Modified: liboggplay/trunk/src/tools/glut-player.c
===================================================================
--- liboggplay/trunk/src/tools/glut-player.c	2007-06-25 10:24:53 UTC (rev 3043)
+++ liboggplay/trunk/src/tools/glut-player.c	2007-06-25 11:05:31 UTC (rev 3044)
@@ -63,7 +63,7 @@
 static int video_track;
 static int audio_track;
 
-#define DISPLAY_FRAMES 1
+#define DISPLAY_FRAMES 0
 
 #define PERIOD_SIZE   512
 
@@ -402,7 +402,7 @@
     avail = oggplay_get_available(player);
     if (avail != saved_avail) {
       saved_avail = avail;
-      printf("available: %d\n", avail);
+      //printf("available: %d\n", avail);
     }
 
 
@@ -526,6 +526,14 @@
   }
   while (1) {
     key_pressed('l', 0, 0);
+    for (i = 0; i < 10; i++) {
+      display_frame();
+    }
+    key_pressed('l', 0, 0);
+    for (i = 0; i < 10; i++) {
+      display_frame();
+    }
+    key_pressed('l', 0, 0);
     for (i = 0; i < 100; i++) {
       display_frame();
     }