From 4c5a3eb27ff9d03ac59269780c6644dd1872e696 Mon Sep 17 00:00:00 2001
From: conrad <conrad@8158c8cd-e7e1-0310-9fa4-c5954c97daef>
Date: Mon, 21 Jan 2008 03:42:55 +0000
Subject: [PATCH] fix tests to run when only FLAC is enabled, and fix immediate
 delete of FLAC encoder

git-svn-id: http://svn.annodex.net/libfishsound/branches/1.0-stable@3371 8158c8cd-e7e1-0310-9fa4-c5954c97daef
---
 src/libfishsound/flac.c  | 12 ++++++++----
 src/tests/comment-test.c |  4 +++-
 src/tests/noop.c         |  5 +++++
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/src/libfishsound/flac.c b/src/libfishsound/flac.c
index 122b757..8f39301 100644
--- a/src/libfishsound/flac.c
+++ b/src/libfishsound/flac.c
@@ -633,11 +633,15 @@ fs_flac_delete (FishSound * fsound)
 #endif
 
   if (fsound->mode == FISH_SOUND_DECODE) {
-    FLAC__stream_decoder_finish(fi->fsd);
-    FLAC__stream_decoder_delete(fi->fsd);
+    if (fi->fsd) {
+      FLAC__stream_decoder_finish(fi->fsd);
+      FLAC__stream_decoder_delete(fi->fsd);
+    }
   } else if (fsound->mode == FISH_SOUND_ENCODE) {
-    FLAC__stream_encoder_finish(fi->fse);
-    FLAC__stream_encoder_delete(fi->fse);
+    if (fi->fse) {
+      FLAC__stream_encoder_finish(fi->fse);
+      FLAC__stream_encoder_delete(fi->fse);
+    }
     if (fi->buffer) fs_free(fi->buffer);
   }
 
diff --git a/src/tests/comment-test.c b/src/tests/comment-test.c
index d45fc02..8614a31 100644
--- a/src/tests/comment-test.c
+++ b/src/tests/comment-test.c
@@ -64,8 +64,10 @@ main (int argc, char * argv[])
    */
 #if HAVE_VORBIS
   fsinfo.format = FISH_SOUND_VORBIS;
-#else
+#elif HAVE_SPEEX
   fsinfo.format = FISH_SOUND_SPEEX;
+#else
+  fsinfo.format = FISH_SOUND_FLAC;
 #endif
 
 #if FS_ENCODE
diff --git a/src/tests/noop.c b/src/tests/noop.c
index 903eb9e..a68af3a 100644
--- a/src/tests/noop.c
+++ b/src/tests/noop.c
@@ -83,5 +83,10 @@ main (int argc, char * argv[])
   noop_test (FISH_SOUND_SPEEX);
 #endif
 
+#if HAVE_FLAC
+  INFO ("Testing new/delete for FLAC");
+  noop_test (FISH_SOUND_FLAC);
+#endif
+
   exit (0);
 }