FSF address change.

[vlc] / include / vlc_interface.h

diff --git a/include/vlc_interface.h b/include/vlc_interface.h
index 1ca13920d06a6ba41c4e4c5877eabcd8d3dfec67..e35925736be255d27cf945bc604be042e11489c0 100644 (file)
--- a/include/vlc_interface.h
+++ b/include/vlc_interface.h
@@ -20,9 +20,10 @@
  *
  * 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.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
+
 typedef struct intf_dialog_args_t intf_dialog_args_t;
 
 /**
@@ -64,6 +65,9 @@ struct intf_thread_t
     void ( *pf_show_dialog ) ( intf_thread_t *, int, int,
                                intf_dialog_args_t * );
 
+    /** Interaction stuff */
+    vlc_bool_t b_interaction;
+
     /** Video window callbacks */
     void * ( *pf_request_window ) ( intf_thread_t *, vout_thread_t *,
                                     int *, int *,
@@ -88,6 +92,7 @@ struct intf_thread_t
  *****************************************************************************/
 struct intf_dialog_args_t
 {
+    intf_thread_t *p_intf;
     char *psz_title;
 
     char **psz_results;
@@ -100,6 +105,9 @@ struct intf_dialog_args_t
     char *psz_extensions;
     vlc_bool_t b_save;
     vlc_bool_t b_multiple;
+
+    /* Specific to INTF_DIALOG_INTERACTION */
+    interaction_dialog_t *p_dialog;
 };
 
 /*****************************************************************************
@@ -156,6 +164,7 @@ VLC_EXPORT( void,              intf_Destroy,    ( intf_thread_t * ) );
 #define INTF_DIALOG_POPUPMENU  20
 
 #define INTF_DIALOG_FILE_GENERIC 30
+#define INTF_DIALOG_INTERACTION 50
 
 #define INTF_DIALOG_UPDATEVLC   90
 #define INTF_DIALOG_VLM   91
@@ -163,12 +172,4 @@ VLC_EXPORT( void,              intf_Destroy,    ( intf_thread_t * ) );
 #define INTF_DIALOG_EXIT       99
 
 /* Useful text messages shared by interfaces */
-#define INTF_ABOUT_MSG \
-    _( "VLC is an open-source and cross-platform multimedia " \
-       "player for various audio and video formats (MPEG-1, MPEG-2, MPEG-4, " \
-       "DivX, mp3, Ogg, etc.) as well as DVDs, VCDs, CD audio, and various " \
-       "streaming protocols.\n\n" \
-       "VLC is also a streaming server with transcoding capabilities " \
-       "(UDP unicast and multicast, HTTP, etc.) mainly designed for " \
-       "high-bandwidth networks.\n\n"\
-       "For more information, have a look at the web site." )
+#define INTF_ABOUT_MSG LICENSE_MSG