X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=gsm_audio.c;h=835ac98f6ba3556bf2b9983b56827ee9cbbfd560;hp=751f3545f39bde83da35f2ebecbafc6110f171ca;hb=71066559a8a3467d9c74824a369225738305b1ab;hpb=20a671d76854520ad9d5ea9d481e008240465e62

diff --git a/gsm_audio.c b/gsm_audio.c
index 751f354..835ac98 100644
--- a/gsm_audio.c
+++ b/gsm_audio.c
@@ -10,45 +10,45 @@
 \*****************************************************************************/ 
 
 extern "C" {
-#include "/usr/local/include/gsm.h"
+#include "libgsmfr/inc/gsm.h"
 
 
 /* create gsm instance */
-void *gsm_audio_create(void)
+void *gsm_fr_create(void)
 {
 	int value = 1;
 	gsm handle;
 
 	handle = gsm_create();
 	if (handle)
-		gsm_option(handle, GSM_OPT_WAV49, &value);
+		gsm_option(handle, 0/*GSM_OPT_WAV49*/, &value);
 
 	return handle;
 }
 
 /* free gsm instance */
-void gsm_audio_destroy(void *arg)
+void gsm_fr_destroy(void *arg)
 {
 	gsm_destroy((gsm)arg);
 }
 
 /* decode frame into samples, return error */
-int gsm_audio_decode(void *arg, unsigned char *frame, signed short *samples)
+int gsm_fr_decode(void *arg, unsigned char *frame, signed short *samples)
 {
-	int value = 0;
+//	int value = 0;
 
-	gsm_option((gsm)arg, GSM_OPT_FRAME_INDEX, &value);
+//	gsm_option((gsm)arg, GSM_OPT_FRAME_INDEX, &value);
 	return gsm_decode((gsm)arg, (gsm_byte *)frame, (gsm_signal *)samples);
 }
 
 /* encode samples into frame */
-void gsm_audio_encode(void *arg, signed short *samples, unsigned char *frame)
+void gsm_fr_encode(void *arg, signed short *samples, unsigned char *frame)
 {
-	int value = 0;
+//	int value = 0;
 	
-	gsm_option((gsm)arg, GSM_OPT_FRAME_INDEX, &value);
+//	gsm_option((gsm)arg, GSM_OPT_FRAME_INDEX, &value);
 	gsm_encode((gsm)arg, (gsm_signal *)samples, (gsm_byte *)frame);
 }
 
-}
+} /* extern "C" */