Bon, puisque �a semble commiter sous BeOS, je commite.

[vlc] / src / interface / interface.c

diff --git a/src/interface/interface.c b/src/interface/interface.c
index 10dad7863af58ca969914abcf294bd3a15ac3a34..15ed2a7a6fa610028e47e0eff05dc96a0bb3ba3d 100644 (file)
--- a/src/interface/interface.c
+++ b/src/interface/interface.c
@@ -11,16 +11,15 @@
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- *
+ * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  *****************************************************************************/
 
 /*****************************************************************************
@@ -40,8 +39,11 @@
 #include "threads.h"
 #include "mtime.h"
 #include "plugins.h"
+#include "playlist.h"
 #include "input.h"
 
+#include "audio_output.h"
+
 #include "intf_msg.h"
 #include "interface.h"
 #include "intf_cmd.h"
@@ -88,8 +90,9 @@ static int      ParseChannel    ( intf_channel_t *p_channel, char *psz_str );
  *****************************************************************************/
 intf_thread_t* intf_Create( void )
 {
-    intf_thread_t *p_intf;
-    char * psz_method;
+    intf_thread_t * p_intf;
+    typedef void    ( intf_getplugin_t ) ( intf_thread_t * p_intf );
+    int             i_index;
 
     /* Allocate structure */
     p_intf = malloc( sizeof( intf_thread_t ) );
@@ -99,24 +102,22 @@ intf_thread_t* intf_Create( void )
         return( NULL );
     }
 
-    /* Request an interface plugin */
-    psz_method = main_GetPszVariable( VOUT_METHOD_VAR, VOUT_DEFAULT_METHOD );
-
-    if( RequestPlugin( &p_intf->intf_plugin, "intf", psz_method ) < 0 )
+    /* Get a suitable interface plugin */
+    for( i_index = 0 ; i_index < p_main->p_bank->i_plugin_count ; i_index++ )
     {
-        intf_ErrMsg( "error: could not open interface plugin intf_%s.so\n", psz_method );
-        free( p_intf );
-        return( NULL );
+        /* If there's a plugin in p_info ... */
+        if( p_main->p_bank->p_info[ i_index ] != NULL )
+        {
+            /* ... and if this plugin provides the functions we want ... */
+            if( p_main->p_bank->p_info[ i_index ]->intf_GetPlugin != NULL )
+            {
+                /* ... then get these functions */
+                ( (intf_getplugin_t *)
+                  p_main->p_bank->p_info[ i_index ]->intf_GetPlugin )( p_intf );
+            }
+        }
     }
 
-    /* Get plugins */
-    p_intf->p_sys_create
-            = GetPluginFunction( p_intf->intf_plugin, "intf_SysCreate" );
-    p_intf->p_sys_manage
-            = GetPluginFunction( p_intf->intf_plugin, "intf_SysManage" );
-    p_intf->p_sys_destroy
-            = GetPluginFunction( p_intf->intf_plugin, "intf_SysDestroy" );
-
     /* Initialize structure */
     p_intf->b_die =     0;
     p_intf->p_vout =    NULL;
@@ -132,7 +133,6 @@ intf_thread_t* intf_Create( void )
     if( p_intf->p_console == NULL )
     {
         intf_ErrMsg("error: can't create control console\n");
-        TrashPlugin( p_intf->intf_plugin );
         free( p_intf );
         return( NULL );
     }
@@ -140,7 +140,6 @@ intf_thread_t* intf_Create( void )
     {
         intf_ErrMsg("error: can't create interface\n");
         intf_ConsoleDestroy( p_intf->p_console );
-        TrashPlugin( p_intf->intf_plugin );
         free( p_intf );
         return( NULL );
     }
@@ -156,9 +155,13 @@ intf_thread_t* intf_Create( void )
  *****************************************************************************/
 void intf_Run( intf_thread_t *p_intf )
 {
+    if( p_main->p_playlist->p_list )
+    {
+        p_intf->p_input = input_CreateThread( INPUT_METHOD_TS_FILE, NULL, 0, 0, p_main->p_intf->p_vout, p_main->p_aout, NULL );
+    }
     /* Execute the initialization script - if a positive number is returned,
      * the script could be executed but failed */
-    if( intf_ExecScript( main_GetPszVariable( INTF_INIT_SCRIPT_VAR, INTF_INIT_SCRIPT_DEFAULT ) ) > 0 )
+    else if( intf_ExecScript( main_GetPszVariable( INTF_INIT_SCRIPT_VAR, INTF_INIT_SCRIPT_DEFAULT ) ) > 0 )
     {
         intf_ErrMsg("warning: error(s) during startup script\n");
     }
@@ -205,9 +208,6 @@ void intf_Destroy( intf_thread_t *p_intf )
     /* Unload channels */
     UnloadChannels( p_intf );
 
-    /* Close plugin */
-    TrashPlugin( p_intf->intf_plugin );
-
     /* Free structure */
     free( p_intf );
 }
@@ -263,6 +263,8 @@ int intf_SelectChannel( intf_thread_t * p_intf, int i_channel )
  *****************************************************************************/
 int intf_ProcessKey( intf_thread_t *p_intf, int i_key )
 {
+    static int i_volbackup;
+    
     switch( i_key )
     {
     case 'Q':                                                  /* quit order */
@@ -286,14 +288,22 @@ int intf_ProcessKey( intf_thread_t *p_intf, int i_key )
         intf_SelectChannel( p_intf, i_key - '0' );
         break;
     case '+':                                                    /* volume + */
-        /* XXX?? */
+        if( (p_main->p_aout != NULL) && (p_main->p_aout->vol < VOLMAX) )
+            p_main->p_aout->vol += VOLSTEP;
         break;
     case '-':                                                    /* volume - */
-        /* XXX?? */
+        if( (p_main->p_aout != NULL) && (p_main->p_aout->vol > VOLSTEP) )
+            p_main->p_aout->vol -= VOLSTEP;
         break;
     case 'M':                                                 /* toggle mute */
     case 'm':
-        /* XXX?? */
+        if( (p_main->p_aout != NULL) && (p_main->p_aout->vol))
+        {
+            i_volbackup = p_main->p_aout->vol;
+            p_main->p_aout->vol = 0;
+        }
+        else if( (p_main->p_aout != NULL) && (!p_main->p_aout->vol))
+            p_main->p_aout->vol = i_volbackup;
         break;
     case 'g':                                                     /* gamma - */
         if( (p_intf->p_vout != NULL) && (p_intf->p_vout->f_gamma > -INTF_GAMMA_LIMIT) )