Changeset 093de8561e556dcc9c233fa4aef3046fb658721c

Timestamp:

08/02/06 21:51:46 (2 years ago)

Author:

Clément Stenac <zorglub@videolan.org>

git-committer:

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

git-parent:

[7eee710f7983a7f186fe5cacaaaca74614690a89]

git-author:

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

Message:

Interaction cleanup, remove some unused functions, factorize some code, ...

Files:

• include/vlc_common.h (modified) (1 diff)
• include/vlc_interaction.h (modified) (1 diff)
• include/vlc_symbols.h (modified) (10 diffs)
• modules/demux/avi/avi.c (modified) (1 diff)
• modules/services_discovery/shout.c (modified) (2 diffs)
• src/interface/interaction.c (modified) (31 diffs)
• src/misc/update.c (modified) (14 diffs)

include/vlc_common.h

@@ -619 +619 @@
-#define DECMALLOC_VOID( var, type ) type* var = (type*)malloc( sizeof(type) );\
-                                    if( !var ) return;
+#define DECMALLOC_ERR( var, type ) type* var = (type*)malloc( sizeof(type) );\
+                                    if( !var ) return VLC_ENOMEM;
-#define DECMALLOC_NULL( var, type ) type* var = (type*)malloc( sizeof(type) );\
-                                    if( !var ) return NULL;
-
-#define FREENULL(a) if( a ) { free( a ); a = NULL; }
+#define FREE(a) if( a ) { free( a ); }
-
-/* Dynamic array handling: realloc array, move data, increment position */

include/vlc_interaction.h

@@ -170 +170 @@
- ***************************************************************************/
-
-#define intf_Interact( a,b ) __intf_Interact( VLC_OBJECT(a), b )
-VLC_EXPORT( int,__intf_Interact,( vlc_object_t *,interaction_dialog_t * ) );
-
-#define intf_UserFatal( a, b, c, d, e... ) __intf_UserFatal( VLC_OBJECT(a),b,c,d, ## e )
-void
+int
-#define intf_UserWarn( a, c, d, e... ) __intf_UserWarn( VLC_OBJECT(a),c,d, ## e )
-void
+int
-#define intf_UserLoginPassword( a, b, c, d, e... ) __intf_UserLoginPassword( VLC_OBJECT(a),b,c,d,e)
-VLC_EXPORT( int, __intf_UserLoginPassword,( vlc_object_t*, const char*, const char*, char **, char **) );
-#define intf_UserYesNo( a, b, c, d, e, f ) __intf_UserYesNo( VLC_OBJECT(a),b,c, d, e, f )
-VLC_EXPORT( int, __intf_UserYesNo,( vlc_object_t*, const char*, const char*, const char*, const char*, const char*) );
-
-#define intf_UserProgress( a, b, c, d, e ) __intf_UserProgress( VLC_OBJECT(a),b,c,d,e )
-VLC_EXPORT( int, __intf_UserProgress,( vlc_object_t*, const char*, const char*, float, int) );
-#define intf_UserProgressUpdate( a, b, c, d, e ) __intf_UserProgressUpdate( VLC_OBJECT(a),b,c,d,e )
-VLC_EXPORT( void, __intf_UserProgressUpdate,( vlc_object_t*, int, const char*, float, int) );
-#define intf_UserProgressIsCancelled( a, b ) __intf_UserProgressIsCancelled( VLC_OBJECT(a),b )
-VLC_EXPORT( vlc_bool_t, __intf_UserProgressIsCancelled,( vlc_object_t*, int ) );
-
-#define intf_UserStringInput( a, b, c, d ) __intf_UserStringInput( VLC_OBJECT(a),b,c,d )
-VLC_EXPORT( int, __intf_UserStringInput,(vlc_object_t*, const char*, const char*, char **) );
-
-
-
-
-
+
+
+
+
+
+
+
-
-#define intf_UserHide( a, b ) __intf_UserHide( VLC_OBJECT(a), b )

include/vlc_symbols.h

@@ -430 +430 @@
-    int (*__input_Read_inner) (vlc_object_t *, input_item_t *, vlc_bool_t);
-    int (*__net_ConnectUDP_inner) (vlc_object_t *p_this, const char *psz_host, int i_port, int hlim);
-int (*__intf_Interact_inner) (vlc_object_t *,interaction_dialog_t *)
+void *__intf_Interact_deprecated
-    void (*intf_InteractionManage_inner) (playlist_t *);
-    void (*intf_InteractionDestroy_inner) (interaction_t *);
-void
+int
-    int (*__intf_UserLoginPassword_inner) (vlc_object_t*, const char*, const char*, char **, char **);
-    int (*__intf_UserYesNo_inner) (vlc_object_t*, const char*, const char*, const char*, const char*, const char*);
-int (*__intf_UserProgress_inner) (vlc_object_t*, const char*, const char*, float, int)
-(*__intf_UserProgressUpdate_inner) (vlc_object_t*, int, const char*, float, int)
+void *__intf_UserProgress_deprecated
+*__intf_UserProgressUpdate_deprecated
-    void (*__intf_UserHide_inner) (vlc_object_t *, int);
-    void *__stats_Create_deprecated;
@@ -518 +518 @@
-    void *stats_TimersClean_deprecated;
-    void (*__stats_TimersClean_inner) (vlc_object_t *);
-(*__intf_IntfProgressUpdate_inner) (vlc_object_t*, int, const char*, float)
-int (*__intf_IntfProgress_inner) (vlc_object_t*, const char*, float)
+*__intf_IntfProgressUpdate_deprecated
+void *__intf_IntfProgress_deprecated
-    void *streaming_ChainToPsz_deprecated;
-void
+int
-    vlc_bool_t (*__intf_UserProgressIsCancelled_inner) (vlc_object_t*, int);
+    int (*__intf_Progress_inner) (vlc_object_t*, const char*, const char*, float, int);
+    void (*__intf_ProgressUpdate_inner) (vlc_object_t*, int, const char*, float, int);
-};
-# if defined (__PLUGIN__)
@@ -909 +911 @@
-#  define __input_Read (p_symbols)->__input_Read_inner
-#  define __net_ConnectUDP (p_symbols)->__net_ConnectUDP_inner
-#  define __intf_Interact (p_symbols)->__intf_Interact_inner
-#  define intf_InteractionManage (p_symbols)->intf_InteractionManage_inner
-#  define intf_InteractionDestroy (p_symbols)->intf_InteractionDestroy_inner
@@ -915 +916 @@
-#  define __intf_UserLoginPassword (p_symbols)->__intf_UserLoginPassword_inner
-#  define __intf_UserYesNo (p_symbols)->__intf_UserYesNo_inner
-#  define __intf_UserProgress (p_symbols)->__intf_UserProgress_inner
-#  define __intf_UserProgressUpdate (p_symbols)->__intf_UserProgressUpdate_inner
-#  define __intf_UserHide (p_symbols)->__intf_UserHide_inner
-#  define __stats_Update (p_symbols)->__stats_Update_inner
@@ -989 +988 @@
-#  define __stats_CounterCreate (p_symbols)->__stats_CounterCreate_inner
-#  define __stats_TimersClean (p_symbols)->__stats_TimersClean_inner
-#  define __intf_IntfProgressUpdate (p_symbols)->__intf_IntfProgressUpdate_inner
-#  define __intf_IntfProgress (p_symbols)->__intf_IntfProgress_inner
-#  define __intf_UserWarn (p_symbols)->__intf_UserWarn_inner
-#  define __intf_UserProgressIsCancelled (p_symbols)->__intf_UserProgressIsCancelled_inner
+#  define __intf_Progress (p_symbols)->__intf_Progress_inner
+#  define __intf_ProgressUpdate (p_symbols)->__intf_ProgressUpdate_inner
-# elif defined (HAVE_DYNAMIC_PLUGINS) && !defined (__BUILTIN__)
-/******************************************************************
@@ -1382 +1381 @@
-    ((p_symbols)->__input_Read_inner) = __input_Read; \
-    ((p_symbols)->__net_ConnectUDP_inner) = __net_ConnectUDP; \
-    ((p_symbols)->__intf_Interact_inner) = __intf_Interact; \
-    ((p_symbols)->intf_InteractionManage_inner) = intf_InteractionManage; \
-    ((p_symbols)->intf_InteractionDestroy_inner) = intf_InteractionDestroy; \
@@ -1388 +1386 @@
-    ((p_symbols)->__intf_UserLoginPassword_inner) = __intf_UserLoginPassword; \
-    ((p_symbols)->__intf_UserYesNo_inner) = __intf_UserYesNo; \
-    ((p_symbols)->__intf_UserProgress_inner) = __intf_UserProgress; \
-    ((p_symbols)->__intf_UserProgressUpdate_inner) = __intf_UserProgressUpdate; \
-    ((p_symbols)->__intf_UserHide_inner) = __intf_UserHide; \
-    ((p_symbols)->__stats_Update_inner) = __stats_Update; \
@@ -1462 +1458 @@
-    ((p_symbols)->__stats_CounterCreate_inner) = __stats_CounterCreate; \
-    ((p_symbols)->__stats_TimersClean_inner) = __stats_TimersClean; \
-    ((p_symbols)->__intf_IntfProgressUpdate_inner) = __intf_IntfProgressUpdate; \
-    ((p_symbols)->__intf_IntfProgress_inner) = __intf_IntfProgress; \
-    ((p_symbols)->__intf_UserWarn_inner) = __intf_UserWarn; \
-    ((p_symbols)->__intf_UserProgressIsCancelled_inner) = __intf_UserProgressIsCancelled; \
+    ((p_symbols)->__intf_Progress_inner) = __intf_Progress; \
+    ((p_symbols)->__intf_ProgressUpdate_inner) = __intf_ProgressUpdate; \
-    (p_symbols)->net_ConvertIPv4_deprecated = NULL; \
-    (p_symbols)->__playlist_ItemCopy_deprecated = NULL; \
@@ -1492 +1488 @@
-    (p_symbols)->playlist_Move_deprecated = NULL; \
-    (p_symbols)->playlist_NodeRemoveParent_deprecated = NULL; \
+    (p_symbols)->__intf_Interact_deprecated = NULL; \
+    (p_symbols)->__intf_UserProgress_deprecated = NULL; \
+    (p_symbols)->__intf_UserProgressUpdate_deprecated = NULL; \
-    (p_symbols)->__stats_Create_deprecated = NULL; \
-    (p_symbols)->__stats_CounterGet_deprecated = NULL; \
@@ -1500 +1499 @@
-    (p_symbols)->stats_TimerClean_deprecated = NULL; \
-    (p_symbols)->stats_TimersClean_deprecated = NULL; \
+    (p_symbols)->__intf_IntfProgressUpdate_deprecated = NULL; \
+    (p_symbols)->__intf_IntfProgress_deprecated = NULL; \
-    (p_symbols)->streaming_ChainToPsz_deprecated = NULL; \
-

modules/demux/avi/avi.c

@@ -2299 +2299 @@
-            float f_pos = (float)i_pos;
-            p_demux->p_sys->last_update = mdate();
-Intf
-   _( "Fixing AVI Index..." ), f_pos
+
+_( "Fixing AVI Index..." ), f_pos, -1
-        }
-

modules/services_discovery/shout.c

@@ -197 +197 @@
-    int i_dialog_id;
-
-
+
+
-
-    p_sys->b_dialog = VLC_TRUE;
@@ -215 +216 @@
-                float f_pos = (float)(p_sys->p_node_cat->i_children)* 2 *100.0 /
-                              260 /* gruiiik FIXME */;
-User
-    
+
+
-            }
-            vlc_object_release( p_input );

src/interface/interaction.c

@@ -37 +37 @@
-#include <vlc/vlc.h>
-#include <vlc/input.h>
+#include <assert.h>
-
-#include "vlc_interaction.h"
@@ -45 +46 @@
- * Local prototypes
- *****************************************************************************/
-intf_
-intf_
-intf_
+
+
+
-                                                          p_interaction );
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-/**
@@ -105 +62 @@
-{
-    int i;
-
-    // Remove all dialogs - Interfaces must be able to clean up their data
-
-    for( i = p_interaction->i_dialogs -1 ; i >= 0; i-- )
-    {
-        interaction_dialog_t * p_dialog = p_interaction->pp_dialogs[i];
-intf_Interaction
+
-        REMOVE_ELEM( p_interaction->pp_dialogs, p_interaction->i_dialogs, i );
-    }
-
-    vlc_object_destroy( p_interaction );
-}
@@ -129 +83 @@
-    vlc_value_t val;
-    int i_index;
-
-
-
+
-
-    // Nothing to do
@@ -138 +90 @@
-    vlc_mutex_lock( &p_interaction->object_lock );
-
-
-
+
-    if( !p_interaction->p_intf )
-    {
@@ -146 +97 @@
-        {
-            interaction_dialog_t *p_dialog = p_interaction->pp_dialogs[i_index];
-
-
-
+
-
-            // Pretend we have hidden and destroyed it
@@ -201 +150 @@
-                         i_index);
-            i_index--;
-intf_Interaction
+
-            break;
-        case NEW_DIALOG:
@@ -222 +171 @@
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- *  \param p_this     Parent vlc_object
- *  \param b_blocking Is this dialog blocking or not?
@@ -248 +191 @@
- *  \param psz_format The message to display
- *  */
-
-
+
-                       const char *psz_title,
-                       const char *psz_format, ... )
-{
-    va_list args;
-
-
-
+
-    
-    p_new->psz_title = strdup( psz_title );
-
-
-
-
-
+
-
-    if( b_blocking )
@@ -270 +206 @@
-        p_new->i_flags = DIALOG_NONBLOCKING_ERROR;
-
-intf_Interact
+return DialogSend
-}
-
@@ -278 +214 @@
- *  \param psz_format The message to display
- *  */
-void
-  
-  
+int
+
+
-{
-    va_list args;
-
-
-
+
-    
-    p_new->psz_title = strdup( psz_title );
-
-
-
-
-
+
-
-    p_new->i_flags = DIALOG_WARNING;
-
-intf_Interact
+return DialogSend
-}
-
@@ -315 +245 @@
-                      const char *psz_other )
-{
-
-
-
-
-
-
+
+
-    p_new->psz_title = strdup( psz_title );
-    p_new->psz_description = strdup( psz_description );
@@ -328 +254 @@
-    if( psz_other )
-        p_new->psz_other_button = strdup( psz_other );
-
-
-
-
-
-
+
+
-}
-
-/** Helper function to create a dialogue showing a progress-bar with some info
- *  \param p_this           Parent vlc_object
-
+ (NULL implies main intf )
- *  \param psz_status       Current status
- *  \param f_position       Current position (0.0->100.0)
@@ -344 +266 @@
- *  \return                 Dialog id, to give to UserProgressUpdate
- */
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-    p_new->psz_description = strdup( psz_status );
-    p_new->val.f_float = f_pos;
-    p_new->i_timeToGo = i_time;
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-    return p_new->i_id;
-}
@@ -376 +294 @@
- *  \return                 nothing
- */
-
-
-
-
-
+
+
+
+
-    interaction_dialog_t *p_dialog;
-
@@ -386 +303 @@
-
-    vlc_mutex_lock( &p_interaction->object_lock );
-intf_InteractionGetById( p_this
+DialogGetById( p_interaction
-
-    if( !p_dialog )
@@ -394 +311 @@
-    }
-
-
-
+
-    p_dialog->psz_description = strdup( psz_status );
-
@@ -405 +321 @@
-}
-
-
+
+
- *  \param p_this           Parent vlc_object
- *  \param i_id             Identifier of the dialogue
@@ -412 +329 @@
-vlc_bool_t __intf_UserProgressIsCancelled( vlc_object_t *p_this, int i_id )
-{
-intf_
+
-    interaction_dialog_t *p_dialog;
+    vlc_bool_t b_cancel;
-
-    if( !p_interaction ) return VLC_TRUE;
-
-    vlc_mutex_lock( &p_interaction->object_lock );
-
-
+
-    if( !p_dialog )
-    {
@@ -426 +343 @@
-    }
-
-
-
+
+
+
-}
-
@@ -444 +362 @@
-                              char **ppsz_password )
-{
-
-    int i_ret;
-
-
-
-
+
-    p_new->i_type = INTERACT_DIALOG_TWOWAY;
-    p_new->psz_title = strdup( psz_title );
@@ -456 +370 @@
-    p_new->i_flags = DIALOG_LOGIN_PW_OK_CANCEL;
-
-intf_Interact
+DialogSend
-
-    if( i_ret != DIALOG_CANCELLED )
-    {
+        assert( p_new->psz_returned[0] && p_new->psz_returned[1] );
-        *ppsz_login = strdup( p_new->psz_returned[0] );
-        *ppsz_password = strdup( p_new->psz_returned[1] );
@@ -478 +393 @@
-                              char **ppsz_usersString )
-{
-
-    int i_ret;
-
-
-
-
-
+
-    p_new->psz_title = strdup( psz_title );
-    p_new->psz_description = strdup( psz_description );
@@ -490 +400 @@
-    p_new->i_flags = DIALOG_PSZ_INPUT_OK_CANCEL;
-
-intf_Interact
+DialogSend
-
-    if( i_ret != DIALOG_CANCELLED )
-    {
+        assert( p_new->psz_returned[0] );
-        *ppsz_usersString = strdup( p_new->psz_returned[0] );
-    }
-    return i_ret;
-}
-
-/** Helper function to create a progress-bar in the main interface with a
- *  single-line description
- *  \param p_this           Parent vlc_object
- *  \param psz_status       Current status
- *  \param f_position       Current position (0.0->100.0)
- *  \return                 Dialog id, to give to IntfProgressUpdate
- */
-int __intf_IntfProgress( vlc_object_t *p_this,
-                         const char *psz_status,
-                         float f_pos )
-{
-    int i_ret;
-    interaction_dialog_t *p_new = NULL;
-
-    INTERACT_INIT( p_new );
-
-    p_new->i_type = INTERACT_DIALOG_ONEWAY;
-    p_new->psz_description = strdup( psz_status );
-    p_new->val.f_float = f_pos;
-
-    p_new->i_flags = DIALOG_INTF_PROGRESS;
-
-    i_ret = intf_Interact( p_this, p_new );
-
-    return p_new->i_id;
-}
-
-/** Update the progress bar in the main interface
- *  \param p_this           Parent vlc_object
- *  \param i_id             Identifier of the dialog
- *  \param psz_status       New status
- *  \param f_position       New position (0.0->100.0)
- *  \return                 nothing
- */
-void __intf_IntfProgressUpdate( vlc_object_t *p_this, int i_id,
-                                const char *psz_status, float f_pos )
-{
-    interaction_t *p_interaction = intf_InteractionGet( p_this );
-    interaction_dialog_t *p_dialog;
-
-    if( !p_interaction ) return;
-
-    vlc_mutex_lock( &p_interaction->object_lock );
-    p_dialog  =  intf_InteractionGetById( p_this, i_id );
-
-    if( !p_dialog )
-    {
-        vlc_mutex_unlock( &p_interaction->object_lock ) ;
-        return;
-    }
-
-    if( p_dialog->psz_description )
-        free( p_dialog->psz_description );
-    p_dialog->psz_description = strdup( psz_status );
-
-    p_dialog->val.f_float = f_pos;
-
-    p_dialog->i_status = UPDATED_DIALOG;
-    vlc_mutex_unlock( &p_interaction->object_lock) ;
-}
-
@@ -567 +417 @@
-void __intf_UserHide( vlc_object_t *p_this, int i_id )
-{
-intf_
+
-    interaction_dialog_t *p_dialog;
-
@@ -573 +423 @@
-
-    vlc_mutex_lock( &p_interaction->object_lock );
- =  intf_InteractionGetById( p_this
+= DialogGetById( p_interaction
-
-    if( !p_dialog )
@@ -584 +434 @@
-    vlc_mutex_unlock( &p_interaction->object_lock );
-}
-
-
-
-/**********************************************************************
@@ -592 +440 @@
-
-/* Get the interaction object. Create it if needed */
-intf_
+
-{
-    playlist_t *p_playlist;
@@ -599 +447 @@
-    p_playlist = (playlist_t*) vlc_object_find( p_this, VLC_OBJECT_PLAYLIST,
-                                                FIND_ANYWHERE );
-
-    if( !p_playlist )
-    {
-        return NULL;
-    }
-
-    if( p_playlist->p_interaction == NULL )
-
-
-
+
-
-    p_interaction = p_playlist->p_interaction;
-
-    vlc_object_release( p_playlist );
-
-    return p_interaction;
-}
-
-/* Create the interaction object in the given playlist object */
-
-
-
-
-
-
+
+
+
+
-    if( !p_interaction )
-    {
@@ -641 +481 @@
-
-/* Look for an interface suitable for interaction */
-intf_
+
-{
-    vlc_list_t  *p_list;
@@ -668 +508 @@
-}
-
-Add a dialog to the queue and wait for answer
- intf_WaitAnswer( interaction_t *p_interact
-interaction_dialog_t *p_dialog
+Find an interaction dialog by its id
+eraction_dialog_t *DialogGetById( interaction_t *p_interaction
+                int i_id
-{
-    int i;
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        {
-
+
+
-        }
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-    else
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-