Version 0.3.0 from FTP

[asterisk/asterisk.git] / formats / format_mp3.c

diff --git a/formats/format_mp3.c b/formats/format_mp3.c
index 83c8e1c..e702e55 100755 (executable)
--- a/formats/format_mp3.c
+++ b/formats/format_mp3.c
@@ -11,6 +11,7 @@
  * the GNU General Public License
  */
  
+#include <asterisk/lock.h>
 #include <asterisk/channel.h>
 #include <asterisk/file.h>
 #include <asterisk/logger.h>
@@ -46,7 +47,7 @@ struct ast_filestream {
 
 
 static struct ast_filestream *glist = NULL;
-static pthread_mutex_t mp3_lock = PTHREAD_MUTEX_INITIALIZER;
+static pthread_mutex_t mp3_lock = AST_MUTEX_INITIALIZER;
 static int glistcnt = 0;
 
 static char *name = "mp3";
@@ -191,7 +192,7 @@ static int ast_read_callback(void *data)
                        s->adj -= (ms - delay);
                s->adj -= 2;
        }
-       s->fr.timelen = delay;
+       s->fr.samples = delay * 8;
 #if 0
        ast_log(LOG_DEBUG, "delay is %d, adjusting by %d, as last was %d\n", delay, s->adj, ms);
 #endif
@@ -217,6 +218,11 @@ static int mp3_apply(struct ast_channel *c, struct ast_filestream *s)
 {
        /* Select our owner for this stream, and get the ball rolling. */
        s->owner = c;
+       return 0;
+}
+
+static int mp3_play(struct ast_filestream *s)
+{
        ast_read_callback(s);
        return 0;
 }
@@ -239,6 +245,21 @@ static int mp3_write(struct ast_filestream *fs, struct ast_frame *f)
        return 0;
 }
 
+static int mp3_seek(struct ast_filestream *fs, long sample_offset, int whence)
+{
+       return -1;
+}
+
+static int mp3_trunc(struct ast_filestream *fs)
+{
+       return -1;
+}
+
+static long mp3_tell(struct ast_filestream *fs)
+{
+       return -1;
+}
+
 static char *mp3_getcomment(struct ast_filestream *s)
 {
        return NULL;
@@ -250,7 +271,11 @@ int load_module()
                                                                mp3_open,
                                                                mp3_rewrite,
                                                                mp3_apply,
+                                                               mp3_play,
                                                                mp3_write,
+                                                               mp3_seek,
+                                                               mp3_trunc,
+                                                               mp3_tell,
                                                                mp3_read,
                                                                mp3_close,
                                                                mp3_getcomment);
@@ -268,7 +293,7 @@ int unload_module()
        tmp = glist;
        while(tmp) {
                if (tmp->owner)
-                       ast_softhangup(tmp->owner);
+                       ast_softhangup(tmp->owner, AST_SOFTHANGUP_APPUNLOAD);
                tmpl = tmp;
                tmp = tmp->next;
                free(tmpl);