* additional interaction enhancements

[vlc] / src / interface / interaction.c

diff --git a/src/interface/interaction.c b/src/interface/interaction.c
index 458d65f229de12a72c6d07c8bbb57813c6001cc8..e0bf1b8adcdd7669cea45c74a3fa6d67a0607de6 100644 (file)
--- a/src/interface/interaction.c
+++ b/src/interface/interaction.c
@@ -222,6 +222,11 @@ void intf_InteractionManage( playlist_t *p_playlist )
                         sizeof( interaction_dialog_t ) );               \
         new->psz_title = NULL;                                          \
         new->psz_description = NULL;                                    \
+        new->psz_defaultButton = NULL;                                  \
+        new->psz_alternateButton = NULL;                                \
+        new->psz_otherButton = NULL;                                    \
+        new->i_timeToGo = 0;                                            \
+        new->b_cancelled = VLC_FALSE;                                   \
         new->p_private = NULL;                                          \
         new->i_id = 0;                                                  \
         new->i_flags = 0;                                               \
@@ -231,44 +236,57 @@ void intf_InteractionManage( playlist_t *p_playlist )
         if( new->psz_title ) free( new->psz_title );                    \
         if( new->psz_description ) free( new->psz_description );
 
-/** Helper function to send an error message
+/** Helper function to send an error message, both in a blocking and non-blocking way
  *  \param p_this     Parent vlc_object
- *  \param i_id       A predefined ID, 0 if not applicable
+ *  \param b_blocking Is this dialog blocking or not?
  *  \param psz_title  Title for the dialog
  *  \param psz_format The message to display
  *  */
 void __intf_UserFatal( vlc_object_t *p_this,
+                       vlc_bool_t b_blocking,
                        const char *psz_title,
                        const char *psz_format, ... )
 {
     va_list args;
     interaction_dialog_t *p_new = NULL;
-    int i_id = DIALOG_ERRORS;
+    
+    INTERACT_INIT( p_new );
+    
+    p_new->psz_title = strdup( psz_title );
 
-    if( i_id > 0 )
-    {
-        p_new = intf_InteractionGetById( p_this, i_id );
-    }
-    if( !p_new )
-    {
-        INTERACT_INIT( p_new );
-        if( i_id > 0 ) p_new->i_id = i_id ;
-    }
+    va_start( args, psz_format );
+    vasprintf( &p_new->psz_description, psz_format, args );
+    va_end( args );
+
+    if( b_blocking )
+        p_new->i_flags = DIALOG_BLOCKING_ERROR;
     else
-    {
-        p_new->i_status = UPDATED_DIALOG;
-    }
+        p_new->i_flags = DIALOG_NONBLOCKING_ERROR;
 
-    p_new->i_flags |= DIALOG_REUSABLE;
+    intf_Interact( p_this, p_new );
+}
 
-    p_new->i_type = INTERACT_DIALOG_ONEWAY;
+/** Helper function to send an warning, which is always shown non-blocking
+ *  \param p_this     Parent vlc_object
+ *  \param psz_title  Title for the dialog
+ *  \param psz_format The message to display
+ *  */
+void __intf_UserWarn( vlc_object_t *p_this,
+                       const char *psz_title,
+                       const char *psz_format, ... )
+{
+    va_list args;
+    interaction_dialog_t *p_new = NULL;
+    
+    INTERACT_INIT( p_new );
+    
     p_new->psz_title = strdup( psz_title );
 
     va_start( args, psz_format );
     vasprintf( &p_new->psz_description, psz_format, args );
     va_end( args );
 
-    p_new->i_flags |= DIALOG_CLEAR_NOSHOW;
+    p_new->i_flags = DIALOG_WARNING;
 
     intf_Interact( p_this, p_new );
 }
@@ -739,13 +757,11 @@ static interaction_dialog_t *intf_InteractionGetById( vlc_object_t* p_this,
 
 static void intf_InteractionDialogDestroy( interaction_dialog_t *p_dialog )
 {
- /*   FREE( p_dialog->val.psz_string );
-
     FREE( p_dialog->psz_title );
     FREE( p_dialog->psz_description );
-    
-    FREE( p_dialog->psz_returned[0] );
-    FREE( p_dialog->psz_returned[1] ); */
+    FREE( p_dialog->psz_defaultButton );
+    FREE( p_dialog->psz_alternateButton );
+    FREE( p_dialog->psz_otherButton );
 
     free( p_dialog );
 }