* Fixed the BeOS compile typo.

[vlc] / plugins / alsa / alsa.c

diff --git a/plugins/alsa/alsa.c b/plugins/alsa/alsa.c
index 91652a2daf6a407eb5a8fde574f120a52d0442f3..edfe1fb7110625f19b307bbaf2160bbedef260f4 100644 (file)
--- a/plugins/alsa/alsa.c
+++ b/plugins/alsa/alsa.c
@@ -1,10 +1,10 @@
 /*****************************************************************************
- * dsp.c : OSS /dev/dsp plugin for vlc
+ * alsa.c : alsa plugin for vlc
  *****************************************************************************
  * Copyright (C) 2000 VideoLAN
+ * $Id: alsa.c,v 1.10 2001/05/30 17:03:11 sam Exp $
  *
- * Authors:
- *  Henri Fallon <henri@videolan.org>
+ * Authors: Henri Fallon <henri@videolan.org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,88 +21,47 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  *****************************************************************************/
 
+#define MODULE_NAME alsa
+#include "modules_inner.h"
+
+/*****************************************************************************
+ * Preamble
+ *****************************************************************************/
+
 #include "defs.h"
 
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/asoundlib.h>                                    /* for alsa :) */
-#include <fcntl.h>
 #include <stdlib.h>                                      /* malloc(), free() */
-// #include <unistd.h>                                            /* close() */
 
 #include "config.h"
 #include "common.h"                                     /* boolean_t, byte_t */
 #include "threads.h"
 #include "mtime.h"
-#include "tests.h"
-#include "plugins.h"
-
-#include "interface.h"
-#include "audio_output.h"
-#include "video.h"
-#include "video_output.h"
-
-#include "main.h"
-
-
-/*****************************************************************************
- * Exported prototypes
- *****************************************************************************/
-static void aout_GetPlugin( p_aout_thread_t p_aout );
 
-/* Audio output */
-int     aout_AlsaOpen         ( aout_thread_t *p_aout );
-int     aout_AlsaReset        ( aout_thread_t *p_aout );
-int     aout_AlsaSetFormat    ( aout_thread_t *p_aout );
-int     aout_AlsaSetChannels  ( aout_thread_t *p_aout );
-int     aout_AlsaSetRate      ( aout_thread_t *p_aout );
-long    aout_AlsaGetBufInfo   ( aout_thread_t *p_aout, long l_buffer_info );
-void    aout_AlsaPlaySamples  ( aout_thread_t *p_aout, byte_t *buffer,
-                               int i_size );
-void    aout_AlsaClose        ( aout_thread_t *p_aout );
+#include "modules.h"
+#include "modules_export.h"
 
 /*****************************************************************************
- * GetConfig: get the plugin structure and configuration
+ * Capabilities defined in the other files.
  *****************************************************************************/
-plugin_info_t * GetConfig( void )
-{
-    int i_fd;
-    plugin_info_t * p_info = (plugin_info_t *) malloc( sizeof(plugin_info_t) );
-
-    p_info->psz_name    = "Alsa plugin";
-    p_info->psz_version = VERSION;
-    p_info->psz_author  = "the VideoLAN team <vlc@videolan.org>";
-
-    p_info->aout_GetPlugin = aout_GetPlugin;
-    p_info->vout_GetPlugin = NULL;
-    p_info->intf_GetPlugin = NULL;
-    p_info->yuv_GetPlugin  = NULL;
-
-
-    /* TODO : test if alsa is available */
-    p_info->i_score = 0x100;
-
-    /* If this plugin was requested, score it higher */
-    if( TestMethod( AOUT_METHOD_VAR, "alsa" ) )
-    {
-        p_info->i_score += 0x200;
-    }
-
-    return( p_info );
-}
+void _M( aout_getfunctions )( function_list_t * p_function_list );
 
 /*****************************************************************************
- * Following functions are only called through the p_info structure
+ * Build configuration tree.
  *****************************************************************************/
+MODULE_CONFIG_START
+    ADD_COMMENT( "Yeah, alsa rocks !" )
+MODULE_CONFIG_STOP
+
+MODULE_INIT_START
+    p_module->i_capabilities =  MODULE_CAPABILITY_NULL
+                                | MODULE_CAPABILITY_AOUT;
+    p_module->psz_longname = "Alsa audio module";
+MODULE_INIT_STOP
+    
+MODULE_ACTIVATE_START
+    _M( aout_getfunctions )( &p_module->p_functions->aout );
+MODULE_ACTIVATE_STOP
+
+MODULE_DEACTIVATE_START
+MODULE_DEACTIVATE_STOP
 
-static void aout_GetPlugin( p_aout_thread_t p_aout )
-{
-    p_aout->p_sys_open        = aout_AlsaOpen;
-    p_aout->p_sys_reset       = aout_AlsaReset;
-    p_aout->p_sys_setformat   = aout_AlsaSetFormat;
-    p_aout->p_sys_setchannels = aout_AlsaSetChannels;
-    p_aout->p_sys_setrate     = aout_AlsaSetRate;
-    p_aout->p_sys_getbufinfo  = aout_AlsaGetBufInfo;
-    p_aout->p_sys_playsamples = aout_AlsaPlaySamples;
-    p_aout->p_sys_close       = aout_AlsaClose;
-}