changeset 478:a415ef9d663f trunk

[svn] - whoever wrote this plugin was a jerk

--- a/ChangeLog	Sun Jan 21 02:40:50 2007 -0800
+++ b/ChangeLog	Sun Jan 21 02:56:22 2007 -0800
@@ -1,3 +1,11 @@
[phone]:40:50 +0000  William Pitcock <[e-mail]>
+  revision [1040]
+  - cleanups
+  
+  trunk/src/vorbis/vorbis.c |    6 +-----
+  1 file changed, 1 insertion(+), 5 deletions(-)
+
+
 2007-01-21 10:38:15 +0000  William Pitcock <[e-mail]>
   revision [1038]
   - remove integrated http in lieu of builtin vorbis http

--- a/src/vorbis/vorbis.c	Sun Jan 21 02:40:50 2007 -0800
+++ b/src/vorbis/vorbis.c	Sun Jan 21 02:56:22 2007 -0800
@@ -88,6 +88,11 @@
     ovcb_tell
 };
 
+typedef struct {
+    VFSFile *fd;
+    gboolean probe;
+} VFSVorbisFile;
+
 gchar *vorbis_fmts[] = { "ogg", "ogm", NULL };
 
 InputPlugin vorbis_ip = {
@@ -150,10 +155,16 @@
     OggVorbis_File vfile;       /* avoid thread interaction */
     char *ext;
     gint result;
+    VFSVorbisFile *fd;
 
     if (!(stream = vfs_fopen(filename, "r"))) {
         return FALSE;
     }
+
+    fd = g_new0(VFSVorbisFile, 1);
+    fd->fd = stream;
+    fd->probe = TRUE;
+
     /*
      * The open function performs full stream detection and machine
      * initialization.  If it returns zero, the stream *is* Vorbis and
@@ -164,7 +175,7 @@
     memset(&vfile, 0, sizeof(vfile));
     g_mutex_lock(vf_mutex);
 
-    result = ov_test_callbacks(stream, &vfile, NULL, 0, vorbis_callbacks);
+    result = ov_test_callbacks(fd, &vfile, NULL, 0, vorbis_callbacks);
 
     switch (result) {
     case OV_EREAD:
@@ -227,6 +238,11 @@
     OggVorbis_File vfile;       /* avoid thread interaction */
     char *ext;
     gint result;
+    VFSVorbisFile *fd;
+
+    fd = g_new0(VFSVorbisFile, 1);
+    fd->fd = stream;
+    fd->probe = TRUE;
 
     /*
      * The open function performs full stream detection and machine
@@ -238,7 +254,7 @@
     memset(&vfile, 0, sizeof(vfile));
     g_mutex_lock(vf_mutex);
 
-    result = ov_test_callbacks(stream, &vfile, NULL, 0, vorbis_callbacks);
+    result = ov_test_callbacks(fd, &vfile, NULL, 0, vorbis_callbacks);
 
     switch (result) {
     case OV_EREAD:
@@ -431,6 +447,7 @@
     long timercount = 0;
     vorbis_info *vi;
     long br;
+    VFSVorbisFile *fd = NULL;
 
     int last_section = -1;
 
@@ -442,19 +459,14 @@
 
     memset(&vf, 0, sizeof(vf));
 
-    if (strncasecmp("http://", filename, 7) != 0) {
-        /* file is a real file */
-        if ((stream = vfs_fopen(filename, "r")) == NULL) {
-            vorbis_eos = TRUE;
-            goto play_cleanup;
-        }
-        datasource = (void *) stream;
+    if ((stream = vfs_fopen(filename, "r")) == NULL) {
+        vorbis_eos = TRUE;
+        goto play_cleanup;
     }
-    else {
-        /* file is a stream */
-        vorbis_is_streaming = 1;
-        datasource = "NULL";
-    }
+
+    fd = g_new0(VFSVorbisFile, 1);
+    fd->fd = stream;
+    datasource = (void *) fd;
 
     /*
      * The open function performs full stream detection and
@@ -995,25 +1007,39 @@
 static size_t
 ovcb_read(void *ptr, size_t size, size_t nmemb, void *datasource)
 {
-    size_t tmp;
+    VFSVorbisFile *handle = (VFSVorbisFile *) datasource;
 
-    return vfs_fread(ptr, size, nmemb, (VFSFile *) datasource);
+    return vfs_fread(ptr, size, nmemb, handle->fd);
 }
 
 static int
 ovcb_seek(void *datasource, int64_t offset, int whence)
 {
-    return vfs_fseek((VFSFile *) datasource, offset, whence);
+    VFSVorbisFile *handle = (VFSVorbisFile *) datasource;
+
+    return vfs_fseek(handle->fd, offset, whence);
 }
 
 static int
 ovcb_close(void *datasource)
 {
-    return vfs_fclose((VFSFile *) datasource);
+    VFSVorbisFile *handle = (VFSVorbisFile *) datasource;
+
+    gint ret = 0;
+
+    if (handle->probe == FALSE)
+    {
+        ret = vfs_fclose(handle->fd);
+	g_free(handle);
+    }
+
+    return ret;
 }
 
 static long
 ovcb_tell(void *datasource)
 {
-    return vfs_ftell((VFSFile *) datasource);
+    VFSVorbisFile *handle = (VFSVorbisFile *) datasource;
+
+    return vfs_ftell(handle->fd);
 }