Annotation of /trunk/smpeg/patches/smpeg-0.4.4-gcc41.patch
Parent Directory | Revision Log
Revision 153 -
(hide annotations)
(download)
Tue May 8 20:52:56 2007 UTC (17 years, 4 months ago) by niro
File size: 1390 byte(s)
Tue May 8 20:52:56 2007 UTC (17 years, 4 months ago) by niro
File size: 1390 byte(s)
-import
1 | niro | 153 | Index: MPEGaudio.h |
2 | =================================================================== | ||
3 | RCS file: /cvs/cvsroot/smpeg/MPEGaudio.h,v | ||
4 | retrieving revision 1.23 | ||
5 | diff -u -p -r1.23 MPEGaudio.h | ||
6 | --- smpeg/MPEGaudio.h 17 Jul 2001 19:52:24 -0000 1.23 | ||
7 | +++ smpeg/MPEGaudio.h 6 Dec 2005 06:10:43 -0000 | ||
8 | @@ -151,12 +151,6 @@ private: | ||
9 | /* The actual MPEG audio class */ | ||
10 | class MPEGaudio : public MPEGerror, public MPEGaudioaction { | ||
11 | |||
12 | - friend void Play_MPEGaudioSDL(void *udata, Uint8 *stream, int len); | ||
13 | - friend int Play_MPEGaudio(MPEGaudio *audio, Uint8 *stream, int len); | ||
14 | -#ifdef THREADED_AUDIO | ||
15 | - friend int Decode_MPEGaudio(void *udata); | ||
16 | -#endif | ||
17 | - | ||
18 | public: | ||
19 | MPEGaudio(MPEGstream *stream, bool initSDL = true); | ||
20 | virtual ~MPEGaudio(); | ||
21 | @@ -367,6 +361,20 @@ public: | ||
22 | #define N_TIMESTAMPS 5 | ||
23 | |||
24 | double timestamp[N_TIMESTAMPS]; | ||
25 | + | ||
26 | + /* Functions which access MPEGaudio internals */ | ||
27 | + friend void Play_MPEGaudioSDL(void *udata, Uint8 *stream, int len); | ||
28 | + friend int Play_MPEGaudio(MPEGaudio *audio, Uint8 *stream, int len); | ||
29 | +#ifdef THREADED_AUDIO | ||
30 | + friend int Decode_MPEGaudio(void *udata); | ||
31 | +#endif | ||
32 | }; | ||
33 | |||
34 | +/* Need to duplicate the prototypes, this is not a typo :) */ | ||
35 | +void Play_MPEGaudioSDL(void *udata, Uint8 *stream, int len); | ||
36 | +int Play_MPEGaudio(MPEGaudio *audio, Uint8 *stream, int len); | ||
37 | +#ifdef THREADED_AUDIO | ||
38 | +int Decode_MPEGaudio(void *udata); | ||
39 | +#endif | ||
40 | + | ||
41 | #endif /* _MPEGAUDIO_H_ */ |