Hi, attached patch removes the playlist prototypes from the c-file cdaudio.c and add an extra header playlist.h for them. This is then included in both cdaudio.c and playlist.c
Please consider applying. Regards, Stefan
diff -u lib/sound/playlist.c lib/sound/playlist.c --- lib/sound/playlist.c (working copy) +++ lib/sound/playlist.c (working copy) @@ -3,6 +3,8 @@ #include "lib/framework/frame.h" +#include "playlist.h" + #define BUFFER_SIZE 2048 static char buffer[BUFFER_SIZE], ByteBuf='\0'; static unsigned int ByteBufPos=0; diff -u lib/sound/cdaudio.c lib/sound/cdaudio.c --- lib/sound/cdaudio.c (working copy) +++ lib/sound/cdaudio.c (working copy) @@ -30,6 +30,8 @@ #include "audio.h" #include "cdaudio.h" +#include "playlist.h" + #ifdef WZ_CDA SDL_CD *cdAudio_dev; @@ -86,14 +88,6 @@ #endif -void PlayList_Init(); -void PlayList_Quit(); -char PlayList_Read(const char* path); -void PlayList_SetTrack(unsigned int t); -char* PlayList_CurrentSong(); -char* PlayList_NextSong(); -void PlayList_DeleteCurrentSong(); - //* // // cdAudio Subclass procedure Index: lib/sound/playlist.h =================================================================== --- lib/sound/playlist.h (revision 0) +++ lib/sound/playlist.h (revision 0) @@ -0,0 +1,20 @@ +/***************************************************************************/ + +#ifndef _PLAYLIST_H_ +#define _PLAYLIST_H_ + +/***************************************************************************/ + +void PlayList_Init(void); +void PlayList_Quit(void); +char PlayList_Read(const char* path); +void PlayList_SetTrack(unsigned int t); +char* PlayList_CurrentSong(void); +char* PlayList_NextSong(void); +void PlayList_DeleteCurrentSong(void); + +/***************************************************************************/ + +#endif /* _PLAYLIST_H_ */ + +/***************************************************************************/
_______________________________________________ Warzone-dev mailing list [email protected] https://mail.gna.org/listinfo/warzone-dev
