[Alsaplayer-commits] SF.net SVN: alsaplayer: [1304] trunk/alsaplayer

[<dom...@us...>]

Revision: 1304
          http://alsaplayer.svn.sourceforge.net/alsaplayer/?rev=1304&view=rev
Author:   dominique_libre
Date:     2007-10-29 14:21:56 -0700 (Mon, 29 Oct 2007)

Log Message:
-----------
Flacstream: change from unsigned int to size_t applied to the old API (Debian); changed the name of the flac plugin to reflect the name of the different flac versions.

Modified Paths:
--------------
    trunk/alsaplayer/ChangeLog
    trunk/alsaplayer/input/flac/FlacPlugin.cpp
    trunk/alsaplayer/input/flac/FlacSeekableStream.cpp
    trunk/alsaplayer/input/flac/FlacSeekableStream.h
    trunk/alsaplayer/input/flac/FlacStream.cpp
    trunk/alsaplayer/input/flac/FlacStream.h
    trunk/alsaplayer/input/flac/OggFlacStream.cpp
    trunk/alsaplayer/input/flac/OggFlacStream.h

Modified: trunk/alsaplayer/ChangeLog
===================================================================
--- trunk/alsaplayer/ChangeLog	2007-10-29 20:02:14 UTC (rev 1303)
+++ trunk/alsaplayer/ChangeLog	2007-10-29 21:21:56 UTC (rev 1304)
@@ -1,7 +1,11 @@
 Mon Oct 29 2007
 ---------------
 * Madej: fixed segfault with PLAY shortcut
-
+* Flacstream: change unsigned int to size_t applied to old API
+  (from Debian)
+* Changed flac plugin version to reflete the name of the different
+  flac versions
+  
 Wed Oct 11 2007
 ---------------
 * Hubert Chan: Replaced GTK2 code in mad plugin by Glib2 code

Modified: trunk/alsaplayer/input/flac/FlacPlugin.cpp
===================================================================
--- trunk/alsaplayer/input/flac/FlacPlugin.cpp	2007-10-29 20:02:14 UTC (rev 1303)
+++ trunk/alsaplayer/input/flac/FlacPlugin.cpp	2007-10-29 21:21:56 UTC (rev 1304)
@@ -20,6 +20,11 @@
  */
 //--------------------------------------------------------------------------
 
+#if !defined(FLAC_API_VERSION_CURRENT) || FLAC_API_VERSION_CURRENT < 8
+#define LEGACY_FLAC
+#else
+#undef LEGACY_FLAC
+#endif
 
 #include <string>
 #include <cstdio>
@@ -321,7 +326,11 @@
     memset (&flac_plugin, 0, sizeof(input_plugin));
 
     flac_plugin.version      = INPUT_PLUGIN_VERSION;
-    flac_plugin.name         = "flac player v1.2";
+#ifdef LEGACY_FLAC
+    flac_plugin.name         = "flac player v1.1.2";
+#else
+    flac_plugin.name         = "flac player v1.1.3/1.1.4/1.2";
+#endif
     flac_plugin.author       = "Drew Hess";
     flac_plugin.init         = flac_init;
     flac_plugin.shutdown     = flac_shutdown;

Modified: trunk/alsaplayer/input/flac/FlacSeekableStream.cpp
===================================================================
--- trunk/alsaplayer/input/flac/FlacSeekableStream.cpp	2007-10-29 20:02:14 UTC (rev 1303)
+++ trunk/alsaplayer/input/flac/FlacSeekableStream.cpp	2007-10-29 21:21:56 UTC (rev 1304)
@@ -257,11 +257,7 @@
 FlacSeekableStream::readCallBack (const FLAC__StreamDecoder * /*decoder*/,
 #endif
 				  FLAC__byte buffer[],
-#ifdef LEGACY_FLAC
-				  unsigned * bytes,
-#else
 				  size_t * bytes,
-#endif
 				  void * client_data)
 {
     if (!client_data)

Modified: trunk/alsaplayer/input/flac/FlacSeekableStream.h
===================================================================
--- trunk/alsaplayer/input/flac/FlacSeekableStream.h	2007-10-29 20:02:14 UTC (rev 1303)
+++ trunk/alsaplayer/input/flac/FlacSeekableStream.h	2007-10-29 21:21:56 UTC (rev 1304)
@@ -116,11 +116,7 @@
 	readCallBack (const FLAC__StreamDecoder * decoder,
 #endif
 		      FLAC__byte buffer[],
-#ifdef LEGACY_FLAC
-		      unsigned * bytes,
-#else
 		      size_t * bytes,
-#endif
 		      void * client_data);
 
 #ifdef LEGACY_FLAC

Modified: trunk/alsaplayer/input/flac/FlacStream.cpp
===================================================================
--- trunk/alsaplayer/input/flac/FlacStream.cpp	2007-10-29 20:02:14 UTC (rev 1303)
+++ trunk/alsaplayer/input/flac/FlacStream.cpp	2007-10-29 21:21:56 UTC (rev 1304)
@@ -323,11 +323,7 @@
 
 
 FLAC__StreamDecoderReadStatus
-#ifdef LEGACY_FLAC
-FlacStream::realReadCallBack (FLAC__byte buffer[], unsigned * bytes)
-#else
 FlacStream::realReadCallBack (FLAC__byte buffer[], size_t * bytes)
-#endif
 {
     *bytes = reader_read (buffer, *bytes, _datasource);
     return *bytes > 0 ? FLAC__STREAM_DECODER_READ_STATUS_CONTINUE :
@@ -342,11 +338,7 @@
 FLAC__StreamDecoderReadStatus
 FlacStream::readCallBack (const FLAC__StreamDecoder *,
 			  FLAC__byte buffer[],
-#ifdef LEGACY_FLAC
-			  unsigned * bytes,
-#else
 			  size_t * bytes,
-#endif
 			  void * client_data)
 {
     if (!client_data)

Modified: trunk/alsaplayer/input/flac/FlacStream.h
===================================================================
--- trunk/alsaplayer/input/flac/FlacStream.h	2007-10-29 20:02:14 UTC (rev 1303)
+++ trunk/alsaplayer/input/flac/FlacStream.h	2007-10-29 21:21:56 UTC (rev 1304)
@@ -199,11 +199,7 @@
 
     FLAC__StreamDecoderReadStatus 
                  realReadCallBack (FLAC__byte buffer[],
-#ifdef LEGACY_FLAC
-				   unsigned * bytes);
-#else
 				   size_t * bytes);
-#endif
 
 
  protected:
@@ -245,11 +241,7 @@
     static FLAC__StreamDecoderReadStatus
 	readCallBack (const FLAC__StreamDecoder * decoder,
 		      FLAC__byte buffer[],
-#ifdef LEGACY_FLAC
-		      unsigned * bytes,
-#else
 		      size_t * bytes,
-#endif
 		      void * client_data);
 
     static void errCallBack (const FLAC__StreamDecoder * decoder,

Modified: trunk/alsaplayer/input/flac/OggFlacStream.cpp
===================================================================
--- trunk/alsaplayer/input/flac/OggFlacStream.cpp	2007-10-29 20:02:14 UTC (rev 1303)
+++ trunk/alsaplayer/input/flac/OggFlacStream.cpp	2007-10-29 21:21:56 UTC (rev 1304)
@@ -188,7 +188,7 @@
 FLAC__StreamDecoderReadStatus
 OggFlacStream::readCallBack (const OggFLAC__StreamDecoder * decoder,
 			     FLAC__byte buffer[],
-			     unsigned * bytes,
+			     size_t * bytes,
 			     void * client_data)
 {
     if (!client_data)

Modified: trunk/alsaplayer/input/flac/OggFlacStream.h
===================================================================
--- trunk/alsaplayer/input/flac/OggFlacStream.h	2007-10-29 20:02:14 UTC (rev 1303)
+++ trunk/alsaplayer/input/flac/OggFlacStream.h	2007-10-29 21:21:56 UTC (rev 1304)
@@ -107,7 +107,7 @@
     static FLAC__StreamDecoderReadStatus
 	readCallBack (const OggFLAC__StreamDecoder * decoder,
 		      FLAC__byte buffer[],
-		      unsigned * bytes,
+		      size_t * bytes,
 		      void * client_data);
 
     static void errCallBack (const OggFLAC__StreamDecoder * decoder,


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.