all: remove unused functions from includes

Signed-off-by: Mahyar Koshkouei <mk@deltabeard.com>

include/flac.h

@@ -1,51 +1,4 @@
 #include "playback.h"
 
-/**
- * Set decoder parameters for flac.
- *
- * \param	decoder Structure to store parameters.
- */
 void setFlac(struct decoder_fn* decoder);
-
-/**
- * Initialise Flac decoder.
- *
- * \param	file	Location of flac file to play.
- * \return			0 on success, else failure.
- */
-int initFlac(const char* file);
-
-/**
- * Get sampling rate of Flac file.
- *
- * \return	Sampling rate.
- */
-uint32_t rateFlac(void);
-
-/**
- * Get number of channels of Flac file.
- *
- * \return	Number of channels for opened file.
- */
-uint8_t channelFlac(void);
-
-/**
- * Decode part of open Flac file.
- *
- * \param buffer	Decoded output.
- * \return			Samples read for each channel.
- */
-uint64_t decodeFlac(void* buffer);
-
-/**
- * Free Flac decoder.
- */
-void exitFlac(void);
-
-/**
- * Checks if the input file is Flac
- *
- * \param in	Input file.
- * \return		0 if Flac file, else not or failure.
- */
 int isFlac(const char* in);

include/mp3.h

@@ -1,44 +1,4 @@
 #include <stdint.h>
 #include "playback.h"
 
-/**
- * Set decoder parameters for MP3.
- *
- * \param	decoder Structure to store parameters.
- */
 void setMp3(struct decoder_fn* decoder);
-
-/**
- * Initialise MP3 decoder.
- *
- * \param	file	Location of MP3 file to play.
- * \return			0 on success, else failure.
- */
-int initMp3(const char* file);
-
-/**
- * Get sampling rate of MP3 file.
- *
- * \return	Sampling rate.
- */
-uint32_t rateMp3(void);
-
-/**
- * Get number of channels of MP3 file.
- *
- * \return	Number of channels for opened file.
- */
-uint8_t channelMp3(void);
-
-/**
- * Decode part of open MP3 file.
- *
- * \param buffer	Decoded output.
- * \return			Samples read for each channel.
- */
-uint64_t decodeMp3(void* buffer);
-
-/**
- * Free MP3 decoder.
- */
-void exitMp3(void);

include/opus.h

@@ -2,19 +2,4 @@
 #include "playback.h"
 
 void setOpus(struct decoder_fn* decoder);
-
-int initOpus(const char* file);
-
-uint32_t rateOpus(void);
-
-uint8_t channelOpus(void);
-
-uint64_t decodeOpus(void* buffer);
-
-void exitOpus(void);
-
-int playOpus(const char* in);
-
-uint64_t fillOpusBuffer(int16_t* bufferOut);
-
 int isOpus(const char* in);

include/playback.h

@@ -8,17 +8,46 @@
 
 struct decoder_fn
 {
+	/**
+	 * Set decoder parameters.
+	 * \param	decoder Structure to store parameters.
+	 * \return	0 on success, else failure.
+	 */
 	int (* init)(const char* file);
+
+	/**
+	 * Get sampling rate of file.
+	 * \return	Sampling rate.
+	 */
 	uint32_t (* rate)(void);
+
+	/**
+	 * Get number of channels of file.
+	 * \return	Number of channels for opened file.
+	 */
 	uint8_t (* channels)(void);
+
+	/**
+	 * Size of output buffer used in decode().
+	 */
 	size_t buffSize;
+
+	/**
+	 * Fill buffer with decoded samples.
+	 * \param buffer	Output buffer to fill.
+	 * \return		Samples read for each channel.
+	 */
 	uint64_t (* decode)(void*);
+
+	/**
+	 * Free codec resources.
+	 */
 	void (* exit)(void);
 };
 
 struct playbackInfo_t
 {
-	char*				file;
+	char*			file;
 	struct errInfo_t*	errInfo;
 };
 

include/sid.h

@@ -1,44 +1,4 @@
 #include <stdint.h>
 #include "playback.h"
 
-/**
- * Set decoder parameters for SID.
- *
- * \param	decoder Structure to store parameters.
- */
 void setSid(struct decoder_fn* decoder);
-
-/**
- * Initialise SID playback.
- *
- * \param	file	Location of SID file to play.
- * \return			0 on success, else failure.
- */
-int initSid(const char* file);
-
-/**
- * Get sampling rate of SID file.
- *
- * \return	Sampling rate.
- */
-uint32_t rateSid(void);
-
-/**
- * Get number of channels of SID file.
- *
- * \return	Number of channels for opened file.
- */
-uint8_t channelSid(void);
-
-/**
- * Read part of open SID file.
- *
- * \param buffer	Output.
- * \return			Samples read for each channel.
- */
-uint64_t readSid(void* buffer);
-
-/**
- * Free SID file.
- */
-void exitSid(void);

include/vorbis.h

@@ -3,19 +3,4 @@
 #include "playback.h"
 
 void setVorbis(struct decoder_fn* decoder);
-
-int initVorbis(const char* file);
-
-uint32_t rateVorbis(void);
-
-uint8_t channelVorbis(void);
-
-uint64_t decodeVorbis(void* buffer);
-
-void exitVorbis(void);
-
-int playVorbis(const char* in);
-
-uint64_t fillVorbisBuffer(char* bufferOut);
-
 int isVorbis(const char* in);

include/wav.h

@@ -1,44 +1,4 @@
 #include <stdint.h>
 #include "playback.h"
 
-/**
- * Set decoder parameters for WAV.
- *
- * \param	decoder Structure to store parameters.
- */
 void setWav(struct decoder_fn* decoder);
-
-/**
- * Initialise WAV playback.
- *
- * \param	file	Location of WAV file to play.
- * \return			0 on success, else failure.
- */
-int initWav(const char* file);
-
-/**
- * Get sampling rate of Wav file.
- *
- * \return	Sampling rate.
- */
-uint32_t rateWav(void);
-
-/**
- * Get number of channels of Wav file.
- *
- * \return	Number of channels for opened file.
- */
-uint8_t channelWav(void);
-
-/**
- * Read part of open Wav file.
- *
- * \param buffer	Output.
- * \return			Samples read for each channel.
- */
-uint64_t readWav(void* buffer);
-
-/**
- * Free Wav file.
- */
-void exitWav(void);

source/flac.c

@@ -7,6 +7,12 @@
 static drflac*		pFlac;
 static const size_t	buffSize = 16 * 1024;
 
+static int initFlac(const char* file);
+static uint32_t rateFlac(void);
+static uint8_t channelFlac(void);
+static uint64_t decodeFlac(void* buffer);
+static void exitFlac(void);
+
 /**
  * Set decoder parameters for flac.
  *

source/mp3.c

@@ -11,6 +11,12 @@ static mpg123_handle	*mh = NULL;
 static uint32_t			rate;
 static uint8_t			channels;
 
+static int initMp3(const char* file);
+static uint32_t rateMp3(void);
+static uint8_t channelMp3(void);
+static uint64_t decodeMp3(void* buffer);
+static void exitMp3(void);
+
 /**
  * Set decoder parameters for MP3.
  *

source/opus.c

@@ -8,6 +8,13 @@ static OggOpusFile*		opusFile;
 static const OpusHead*	opusHead;
 static const size_t		buffSize = 32 * 1024;
 
+static int initOpus(const char* file);
+static uint32_t rateOpus(void);
+static uint8_t channelOpus(void);
+static uint64_t decodeOpus(void* buffer);
+static void exitOpus(void);
+static uint64_t fillOpusBuffer(int16_t* bufferOut);
+
 /**
  * Set decoder parameters for Opus.
  *

source/sid.cpp

@@ -3,7 +3,15 @@
 #include <string.h>
 #include <sidplay/player.h>
 
+extern "C"
+{
 #include "playback.h"
+static int initSid(const char* file);
+static uint32_t rateSid(void);
+static uint8_t channelSid(void);
+static uint64_t readSid(void* buffer);
+static void exitSid(void);
+}
 
 static uint32_t		frequency = 44100;
 static int			channels = SIDEMU_STEREO;
@@ -17,13 +25,6 @@ static int			bitsPerSample = SIDEMU_16BIT;
 emuEngine	*myEmuEngine = NULL;
 sidTune		*myTune = NULL;
 
-extern "C" void setSid(struct decoder_fn* decoder);
-extern "C" int initSid(const char* file);
-extern "C" uint32_t rateSid(void);
-extern "C" uint8_t channelSid(void);
-extern "C" uint64_t readSid(void* buffer);
-extern "C" void exitSid(void);
-
 /**
  * Set decoder parameters for SID.
  *

source/vorbis.c

@@ -10,6 +10,13 @@ static vorbis_info		*vi;
 static FILE				*f;
 static const size_t		buffSize = 8 * 4096;
 
+static int initVorbis(const char* file);
+static uint32_t rateVorbis(void);
+static uint8_t channelVorbis(void);
+static uint64_t decodeVorbis(void* buffer);
+static void exitVorbis(void);
+static uint64_t fillVorbisBuffer(char* bufferOut);
+
 /**
  * Set decoder parameters for Vorbis.
  *

source/wav.c

@@ -10,6 +10,12 @@ static FILE*		pWav		= NULL;
 static char			header[45];
 static uint8_t		channels;
 
+static int initWav(const char* file);
+static uint32_t rateWav(void);
+static uint8_t channelWav(void);
+static uint64_t readWav(void* buffer);
+static void exitWav(void);
+
 /**
  * Set decoder parameters for WAV.
  *