X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=include%2Fvlc_dialog.h;h=6df9ad7da35ac1b5f4408dac5e9c30bf28887254;hb=525abdab4db413884b4d03e0d32d67ac35dff17d;hp=9758243b6c83a070d47d3b4569f642c112a782b9;hpb=cde300c7797d6e849c08fe01a6a0998794d98244;p=vlc

diff --git a/include/vlc_dialog.h b/include/vlc_dialog.h
index 9758243b6c..6df9ad7da3 100644
--- a/include/vlc_dialog.h
+++ b/include/vlc_dialog.h
@@ -35,12 +35,11 @@ typedef struct dialog_fatal_t
 {
     const char *title;
     const char *message;
-    bool modal;
 } dialog_fatal_t;
 
-VLC_EXPORT( void, dialog_VFatal, (vlc_object_t *, bool, const char *, const char *, va_list) );
+VLC_API void dialog_VFatal(vlc_object_t *, bool, const char *, const char *, va_list);
 
-static inline LIBVLC_FORMAT(3, 4)
+static inline VLC_FORMAT(3, 4)
 void dialog_Fatal (vlc_object_t *obj, const char *title, const char *fmt, ...)
 {
      va_list ap;
@@ -52,7 +51,7 @@ void dialog_Fatal (vlc_object_t *obj, const char *title, const char *fmt, ...)
 #define dialog_Fatal(o, t, ...) \
         dialog_Fatal(VLC_OBJECT(o), t, __VA_ARGS__)
 
-static inline LIBVLC_FORMAT(3, 4)
+static inline VLC_FORMAT(3, 4)
 void dialog_FatalWait (vlc_object_t *obj, const char *title,
                        const char *fmt, ...){
      va_list ap;
@@ -64,8 +63,59 @@ void dialog_FatalWait (vlc_object_t *obj, const char *title,
 #define dialog_FatalWait(o, t, ...) \
         dialog_FatalWait(VLC_OBJECT(o), t, __VA_ARGS__)
 
-VLC_EXPORT( int, dialog_Register, (vlc_object_t *) );
-VLC_EXPORT( int, dialog_Unregister, (vlc_object_t *) );
+/**
+ * A login dialog.
+ */
+typedef struct dialog_login_t
+{
+    const char *title;
+    const char *message;
+    char **username;
+    char **password;
+} dialog_login_t;
+
+VLC_API void dialog_Login(vlc_object_t *, char **, char **, const char *, const char *, ...) VLC_FORMAT (5, 6);
+#define dialog_Login(o, u, p, t, ...) \
+        dialog_Login(VLC_OBJECT(o), u, p, t, __VA_ARGS__)
+
+/**
+ * A question dialog.
+ */
+typedef struct dialog_question_t
+{
+    const char *title;
+    const char *message;
+    const char *yes;
+    const char *no;
+    const char *cancel;
+    int answer;
+} dialog_question_t;
+
+VLC_API int dialog_Question(vlc_object_t *, const char *, const char *, const char *, const char *, const char *);
+#define dialog_Question(o, t, m, y, n, c) \
+        dialog_Question(VLC_OBJECT(o), t, m, y, n, c)
+
+typedef struct dialog_progress_bar_t
+{   /* Request-time parameters */
+    const char *title;
+    const char *message;
+    const char *cancel;
+    /* Permanent parameters */
+    void (*pf_update) (void *, const char *, float);
+    bool (*pf_check) (void *);
+    void (*pf_destroy) (void *);
+    void *p_sys;
+} dialog_progress_bar_t;
+
+VLC_API dialog_progress_bar_t * dialog_ProgressCreate(vlc_object_t *, const char *, const char *, const char *) VLC_USED;
+#define dialog_ProgressCreate(o, t, m, c) \
+        dialog_ProgressCreate(VLC_OBJECT(o), t, m, c)
+VLC_API void dialog_ProgressDestroy(dialog_progress_bar_t *);
+VLC_API void dialog_ProgressSet(dialog_progress_bar_t *, const char *, float);
+VLC_API bool dialog_ProgressCancelled(dialog_progress_bar_t *);
+
+VLC_API int dialog_Register(vlc_object_t *);
+VLC_API int dialog_Unregister(vlc_object_t *);
 #define dialog_Register(o) dialog_Register(VLC_OBJECT(o))
 #define dialog_Unregister(o) dialog_Unregister(VLC_OBJECT(o))