SOURCES: smpeg-gcc4.patch - fix from cvs.

[pluto]

Author: pluto                        Date: Fri Jan 20 20:13:05 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- fix from cvs.

---- Files affected:
SOURCES:
   smpeg-gcc4.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/smpeg-gcc4.patch
diff -u SOURCES/smpeg-gcc4.patch:1.1 SOURCES/smpeg-gcc4.patch:1.2
--- SOURCES/smpeg-gcc4.patch:1.1	Sun Jan 15 16:33:07 2006
+++ SOURCES/smpeg-gcc4.patch	Fri Jan 20 21:13:00 2006
@@ -1,14 +1,41 @@
---- smpeg-0.4.4/MPEGaudio.h.orig	2006-01-15 16:17:56.356444000 +0100
-+++ smpeg-0.4.4/MPEGaudio.h	2006-01-15 16:18:36.686965250 +0100
-@@ -148,6 +148,11 @@
-   char buffer[2*WINDOWSIZE];
+Index: MPEGaudio.h
+===================================================================
+RCS file: /cvs/cvsroot/smpeg/MPEGaudio.h,v
+retrieving revision 1.23
+diff -u -p -r1.23 MPEGaudio.h
+--- smpeg/MPEGaudio.h	17 Jul 2001 19:52:24 -0000	1.23
++++ smpeg/MPEGaudio.h	6 Dec 2005 06:10:43 -0000
+@@ -151,12 +151,6 @@ private:
+ /* The actual MPEG audio class */
+ class MPEGaudio : public MPEGerror, public MPEGaudioaction {
+ 
+-    friend void Play_MPEGaudioSDL(void *udata, Uint8 *stream, int len);
+-    friend int Play_MPEGaudio(MPEGaudio *audio, Uint8 *stream, int len);
+-#ifdef THREADED_AUDIO
+-    friend int Decode_MPEGaudio(void *udata);
+-#endif
+-
+ public:
+     MPEGaudio(MPEGstream *stream, bool initSDL = true);
+     virtual ~MPEGaudio();
+@@ -367,6 +361,20 @@ public:
+ #define N_TIMESTAMPS 5
+ 
+   double timestamp[N_TIMESTAMPS];
++
++  /* Functions which access MPEGaudio internals */
++  friend void Play_MPEGaudioSDL(void *udata, Uint8 *stream, int len);
++  friend int Play_MPEGaudio(MPEGaudio *audio, Uint8 *stream, int len);
++#ifdef THREADED_AUDIO
++  friend int Decode_MPEGaudio(void *udata);
++#endif
  };
  
++/* Need to duplicate the prototypes, this is not a typo :) */
 +void Play_MPEGaudioSDL(void *udata, Uint8 *stream, int len);
++int Play_MPEGaudio(MPEGaudio *audio, Uint8 *stream, int len);
 +#ifdef THREADED_AUDIO
 +int Decode_MPEGaudio(void *udata);
 +#endif
 +
- /* The actual MPEG audio class */
- class MPEGaudio : public MPEGerror, public MPEGaudioaction {
- 
+ #endif /* _MPEGAUDIO_H_ */
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/smpeg-gcc4.patch?r1=1.1&r2=1.2&f=u