Changeset 15354b0406c9222fd39dcee94f9d7239d65d5f39

Timestamp:

11/12/05 17:06:19 (3 years ago)

Author:

Clément Stenac <zorglub@videolan.org>

git-committer:

Clément Stenac <zorglub@videolan.org> 1134317179 +0000

git-parent:

[0f6f58c60482c4b0698578e734f68e3a269e7ad1]

git-author:

Clément Stenac <zorglub@videolan.org> 1134317179 +0000

Message:

* Handle dialogs needing answer
* Handle interfaces not providing interaction correctly
* Add a new helper to request authentication
* Add return codes

Files:

• include/vlc_interaction.h (modified) (7 diffs)
• include/vlc_interface.h (modified) (3 diffs)
• include/vlc_symbols.h (modified) (5 diffs)
• src/input/input.c (modified) (2 diffs)
• src/interface/interaction.c (modified) (15 diffs)

include/vlc_interaction.h

@@ -40 +40 @@
-    WIDGET_TEXT,                        //< Text display
-    WIDGET_PROGRESS,                    //< A progress bar
-    
+_TEXT
-};
-
@@ -53 +53 @@
-    char           *psz_description;    //< Descriptor string
-
-    /* For dialogs */
-    int             i_widgets;          //< Nu,ber of dialog widgets
-    user_widget_t **pp_widgets;         //< Dialog widgets
-
-lc_bool_t      b_reusable;         //< Do we have to reuse this ?
+oid *          p_private;          //< Private interface data
-
-    void *          p_private;          //< Private interface data
-    int             i_status;           //< Dialog status;
+    int             i_action;           //< Action to perform;
+    int             i_flags;            //< Misc flags
+    int             i_return;           //< Return status
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-};
-
@@ -70 +93 @@
-enum
-{
-
-
-
-
-
-
+
+
+
+
+
+
+
-};
-
@@ -83 +107 @@
-enum
-{
-
-
-
-
-
+
+
+
-};
-
@@ -96 +118 @@
-{
-    DIALOG_FIRST,
-
-
-
+
-
-    DIALOG_LAST_PREDEFINED,
@@ -125 +145 @@
-    INTERACT_NEW,
-    INTERACT_UPDATE,
-
+
+
-};
-
@@ -135 +156 @@
-VLC_EXPORT( int,__intf_Interact,( vlc_object_t *,interaction_dialog_t * ) );
-
-
-
+
+
+
+
-
-VLC_EXPORT( void, intf_InteractionManage,( playlist_t *) );

include/vlc_interface.h

@@ -93 +93 @@
-struct intf_dialog_args_t
-{
+    intf_thread_t *p_intf;
-    char *psz_title;
-
@@ -105 +106 @@
-    vlc_bool_t b_save;
-    vlc_bool_t b_multiple;
+
+    /* Specific to INTF_DIALOG_INTERACTION */
+    interaction_dialog_t *p_dialog;
-};
-
@@ -161 +165 @@
-
-#define INTF_DIALOG_FILE_GENERIC 30
+#define INTF_DIALOG_INTERACTION 50
-
-#define INTF_DIALOG_UPDATEVLC   90

include/vlc_symbols.h

@@ -146 +146 @@
-int __vlc_threads_end (vlc_object_t *);
-int sout_AccessOutRead (sout_access_out_t *, block_t *);
+int __intf_UserLoginPassword (vlc_object_t*, const char*, const char*, char **, char **);
-int demux2_vaControlHelper (stream_t *, int64_t i_start, int64_t i_end, int i_bitrate, int i_align, int i_query, va_list args);
-int httpd_UrlCatch (httpd_url_t *, int i_msg, httpd_callback_t, httpd_callback_sys_t *);
@@ -298 +299 @@
-int vout_vaControlDefault (vout_thread_t *, int, va_list);
-int playlist_NodeEmpty (playlist_t *, playlist_item_t *, vlc_bool_t);
-int, 
+
-spu_t * __spu_Create (vlc_object_t *);
-int playlist_NodeRemoveItem (playlist_t *,playlist_item_t*,playlist_item_t *);
@@ -859 +860 @@
-    void (*intf_InteractionManage_inner) (playlist_t *);
-    void (*intf_InteractionDestroy_inner) (interaction_t *);
-
+
+
-};
-#  if defined (__PLUGIN__)
@@ -1275 +1277 @@
-#  define intf_InteractionDestroy (p_symbols)->intf_InteractionDestroy_inner
-#  define __intf_UserFatal (p_symbols)->__intf_UserFatal_inner
+#  define __intf_UserLoginPassword (p_symbols)->__intf_UserLoginPassword_inner
-#  elif defined (HAVE_DYNAMIC_PLUGINS) && !defined (__BUILTIN__)
-/******************************************************************
@@ -1693 +1696 @@
-    ((p_symbols)->intf_InteractionDestroy_inner) = intf_InteractionDestroy; \
-    ((p_symbols)->__intf_UserFatal_inner) = __intf_UserFatal; \
+    ((p_symbols)->__intf_UserLoginPassword_inner) = __intf_UserLoginPassword; \
-    (p_symbols)->net_ConvertIPv4_deprecated = NULL; \
-

src/input/input.c

@@ -2096 +2096 @@
-        {
-            msg_Err( p_input, "no suitable access module for `%s'", psz_mrl );
-
-
-
+
+
-            goto error;
-        }
@@ -2168 +2167 @@
-            msg_Err( p_input, "no suitable demux module for `%s/%s://%s'",
-                     psz_access, psz_demux, psz_path );
+            intf_UserFatal( VLC_OBJECT( p_input), _("Errors"),
+                            "Unrecognized format for '%s'", psz_mrl );
-            goto error;
-        }

src/interface/interaction.c

@@ -64 +64 @@
-                                    p_dialog )
-{
-
-    interaction_t *p_interaction = intf_InteractionGet( p_this );
-
@@ -73 +72 @@
-    }
-
-
+
+
+
+
-    {
-        return intf_WaitAnswer( p_interaction, p_dialog );
@@ -79 +81 @@
-    else
-    {
+        p_dialog->i_flags |=  DIALOG_GOT_ANSWER;
-        return intf_Send( p_interaction, p_dialog );
-    }
@@ -115 +118 @@
-    if( !p_interaction->p_intf )
-    {
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    for( i_index = 0 ; i_index < p_interaction->i_dialogs; i_index ++ )
-    {
-        interaction_dialog_t *p_dialog = p_interaction->pp_dialogs[i_index];
-
-        switch( p_dialog->i_status )
-        {
-        case ANSWERED_DIALOG:
-            /// \todo Signal we have an answer
-            // - If have answer, signal what is waiting
-            // (vlc_cond ? dangerous in case of pb ?)
-
-            // Ask interface to hide it
-            msg_Dbg( p_interaction, "Hiding dialog %i", p_dialog->i_id );
-            p_dialog->i_action = INTERACT_HIDE;
-            val.p_address = p_dialog;
-
+
+
-            p_dialog->i_status = HIDING_DIALOG;
-            break;
@@ -144 +152 @@
-            p_dialog->i_action = INTERACT_UPDATE;
-            val.p_address = p_dialog;
-
+
+
-            p_dialog->i_status = SENT_DIALOG;
-            msg_Dbg( p_interaction, "Updating dialog %i, %i widgets",
@@ -150 +159 @@
-            break;
-        case HIDDEN_DIALOG:
-
+
+
-            {
-
+
+
+
+
+
+
-            }
-            break;
+        case DESTROYED_DIALOG:
+            // Interface has now destroyed it, remove it
+            /// \todo Remove it from the list
+            /// \todo Free data fields
+            free( p_dialog );
-        case NEW_DIALOG:
-            // This is truly a new dialog, send it.
-            p_dialog->i_action = INTERACT_NEW;
-            val.p_address = p_dialog;
-
-
-
+
+
-            p_dialog->i_status = SENT_DIALOG;
-            break;
@@ -167 +186 @@
-    }
-
-
+
+
+
+
-
-    vlc_mutex_unlock( &p_playlist->p_interaction->object_lock );
@@ -188 +210 @@
-        if( new->psz_description ) free( new->psz_description );
-
- fatal
+n error
- *  \param p_this     Parent vlc_object
- *  \param i_id       A predefined ID, 0 if not applicable
@@ -194 +216 @@
- *  \param psz_format The message to display
- *  */
- int i_id,
+
-                       const char *psz_title,
-                       const char *psz_format, ... )
@@ -201 +223 @@
-    interaction_dialog_t *p_new = NULL;
-    user_widget_t *p_widget = NULL;
+    int i_id = DIALOG_ERRORS;
-
-    if( i_id > 0 )
@@ -216 +239 @@
-    }
-
-
+
+
+
-    p_new->psz_title = strdup( psz_title );
-
@@ -235 +260 @@
-}
-
-
-
-
+
+
+
+
+
+
+
- */
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-/**********************************************************************
@@ -338 +404 @@
-static int intf_WaitAnswer( interaction_t *p_interact, interaction_dialog_t *p_dialog )
-{
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -345 +445 @@
-static int intf_Send( interaction_t *p_interact, interaction_dialog_t *p_dialog )
-{
+    int i;
+    vlc_bool_t b_found = VLC_FALSE;
-    vlc_mutex_lock( &p_interact->object_lock );
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    vlc_mutex_unlock( &p_interact->object_lock );
-    return VLC_SUCCESS;
@@ -363 +476 @@
-    int i;
-
+    if( !p_interaction ) return NULL;
+
-    for( i = 0 ; i< p_interaction->i_dialogs; i++ )
-    {