Changeset 5afb060fb5643133bc5122733a4f642d9e22ba63

Show
Ignore:
Timestamp:
05/12/05 16:51:39 (3 years ago)
Author:
Clément Stenac <zorglub@videolan.org>
git-committer:
Clément Stenac <zorglub@videolan.org> 1133797899 +0000
git-parent:

[d93b664ac9c3d2077bf1cdc03abf2dcf2835e24e]

git-author:
Clément Stenac <zorglub@videolan.org> 1133797899 +0000
Message:

Very beginning of the interaction framework (Refs:#27)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • Makefile.am

    r8acc19a r5afb060  
    394394    src/interface/interface.c \ 
    395395    src/interface/intf_eject.c \ 
     396    src/interface/interaction.c \ 
    396397    src/playlist/playlist.c \ 
    397398    src/playlist/sort.c \ 

  • extras/make.pl

    r4900b27 r5afb060  
    3030        $line =~ /^Making\sclean\sin\s\./ || 
    3131    $line =~ /^then\smv/ || 
    32         $line =~ /make\s\sall-recursive/ ) 
     32        $line =~ /make\s\sall-recursive/ || 
     33        $line =~ s/^[A-z0-9-]*ar\s[A-z0-9]*\s([A-z0-9\-_\/\.]*)\s.*//g || 
     34        $line =~ s/^rm\s\-f\s(.*)//g ) 
    3335     {} 
    3436     # Info  
    …… 
    3739          $line =~ s/^.* (lib.*\.o)\s\.\/(.*)/ COMPILE : $2/g || 
    3840          $line =~ s/^.* (lib.*\.o)\s`.*`(.*);\ \\/ COMPILE : $2/ || 
    39           $line =~ s/^[A-z0-9-]*ar\s[A-z0-9]*\s([A-z0-9\-_\/\.]*)\s.*/ ARCHIVE : $1/g || 
    4041          $line =~ s/^[A-z0-9-]*ranlib\s(.*)/ RANLIB  : $1/g || 
    4142          $line =~ s/^Making\sall\sin\s(.*)/MAKE     : $1/g || 
    4243          $line =~ s/^Making\sclean\sin\s(.*)/CLEAN  : $1/g || 
    43           $line =~ s/^rm\s\-f\s(.*)/ REMOVE  : $1/g || 
    4444          $line =~ s/.*\-o\s([^\s]*)\s.*/ BUILD   : $1/g) 
    4545 

  • include/vlc_common.h

    rbfbe106 r5afb060  
    224224    PLAYLIST_SKIP,      /**< arg1=int,                          res=can fail*/ 
    225225    PLAYLIST_GOTO,      /**< arg1=int                           res=can fail */ 
    226     PLAYLIST_VIEWGOTO,      /**< arg1=int                       res=can fail */ 
     226    PLAYLIST_VIEWGOTO   /**< arg1=int                           res=can fail */ 
    227227} playlist_command_t; 
    228228 
    …… 
    252252typedef struct intf_msg_t intf_msg_t; 
    253253typedef struct intf_channel_t intf_channel_t; 
     254typedef struct interaction_t interaction_t; 
     255typedef struct interaction_dialog_t interaction_dialog_t; 
     256typedef struct user_widget_t user_widget_t; 
    254257 
    255258/* Input */ 
    …… 
    339342typedef struct announce_handler_t announce_handler_t; 
    340343typedef struct sap_handler_t sap_handler_t; 
    341 //typedef struct slp_session_t    slp_session_t; 
     344/* typedef struct slp_session_t    slp_session_t; */ 
    342345 
    343346/* Decoders */ 

  • include/vlc_interface.h

    r7b885b9 r5afb060  
    2323 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA. 
    2424 *****************************************************************************/ 
     25 
    2526 
    2627typedef struct intf_dialog_args_t intf_dialog_args_t; 
    …… 
    6465    void ( *pf_show_dialog ) ( intf_thread_t *, int, int, 
    6566                               intf_dialog_args_t * ); 
     67 
     68    /** Interaction stuff */ 
     69    int          i_last_id; 
     70    int ( *pf_interact ) ( intf_thread_t *, interaction_dialog_t *, vlc_bool_t ); 
    6671 
    6772    /** Video window callbacks */ 

  • include/vlc_playlist.h

    r28563cf r5afb060  
    214214    vlc_mutex_t gc_lock;         /**< Lock to protect the garbage collection */ 
    215215 
     216    // The following members are about user interaction 
     217    // The playlist manages the user interaction to avoid creating another 
     218    // thread 
     219    vlc_bool_t b_manage_interaction; 
     220    interaction_t *p_interaction; 
     221 
    216222    /*@}*/ 
    217223}; 

  • src/input/input.c

    r5c8d564 r5afb060  
    20952095        { 
    20962096            msg_Err( p_input, "no suitable access module for `%s'", psz_mrl ); 
     2097            intf_UserFatal( p_input, "Unable to open '%s'", psz_mrl ); 
    20972098            goto error; 
    20982099        } 

  • src/interface/interface.c

    ra0c550b r5afb060  
    9999    p_intf->pf_release_window = NULL; 
    100100    p_intf->pf_control_window = NULL; 
     101    p_intf->pf_interact       = NULL; 
    101102    p_intf->b_play = VLC_FALSE; 
    102103 

  • src/playlist/playlist.c

    r5c8d564 r5afb060  
    3333#include "vlc_playlist.h" 
    3434 
     35#include "vlc_interaction.h" 
     36 
    3537#define TITLE_CATEGORY N_( "By category" ) 
    3638#define TITLE_SIMPLE   N_( "Manually added" ) 
    …… 
    195197    } 
    196198 
     199    // Preparse 
    197200    p_playlist->p_preparse->i_waiting = 0; 
    198201    p_playlist->p_preparse->pp_waiting = NULL; 
     202 
     203    // Interaction 
     204    p_playlist->b_manage_interaction = VLC_FALSE; 
     205    p_playlist->p_interaction = NULL; 
    199206 
    200207    vlc_object_attach( p_playlist->p_preparse, p_playlist ); 
    …… 
    578585    while( !p_playlist->b_die ) 
    579586    { 
     587        if( p_playlist->b_manage_interaction ) 
     588        { 
     589            intf_InteractionManage( p_playlist ); 
     590        } 
     591 
    580592        vlc_mutex_lock( &p_playlist->object_lock ); 
    581593