* cmml/intf.c: Fix refcount leak on main interface (thanks to gibalou for help)

[vlc] / include / vlc_interface.h

diff --git a/include/vlc_interface.h b/include/vlc_interface.h
index e2af220641e46f3428da3a19394a8644a262ef78..2626cb5773e9180c72d55515d97eb77750461688 100644 (file)
--- a/include/vlc_interface.h
+++ b/include/vlc_interface.h
@@ -90,11 +90,6 @@ struct intf_dialog_args_t
 {
     char *psz_title;
 
-    vlc_bool_t  b_blocking;
-    vlc_bool_t  b_ready;
-    vlc_mutex_t lock;
-    vlc_cond_t  wait;
-
     char **psz_results;
     int  i_results;
 
@@ -123,10 +118,13 @@ VLC_EXPORT( void,              intf_Destroy,    ( intf_thread_t * ) );
  *****************************************************************************/
 #if defined( WIN32 ) && !defined( UNDER_CE )
 #    define CONSOLE_INTRO_MSG \
+         if( !getenv( "PWD" ) || !getenv( "PS1" ) ) /* detect cygwin shell */ \
+         { \
          AllocConsole(); \
          freopen( "CONOUT$", "w", stdout ); \
          freopen( "CONOUT$", "w", stderr ); \
          freopen( "CONIN$", "r", stdin ); \
+         } \
          msg_Info( p_intf, COPYRIGHT_MESSAGE ); \
          msg_Info( p_intf, _("\nWarning: if you can't access the GUI " \
                              "anymore, open a dos command box, go to the " \
@@ -144,6 +142,8 @@ VLC_EXPORT( void,              intf_Destroy,    ( intf_thread_t * ) );
 #define INTF_DIALOG_CAPTURE     5
 #define INTF_DIALOG_SAT         6
 
+#define INTF_DIALOG_DIRECTORY   7
+
 #define INTF_DIALOG_STREAMWIZARD 8
 #define INTF_DIALOG_WIZARD 9
 
@@ -163,9 +163,9 @@ VLC_EXPORT( void,              intf_Destroy,    ( intf_thread_t * ) );
 #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, ...) as well as DVDs, VCDs, CD audio, and various " \
+       "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, ...) mainly designed for " \
+       "(UDP unicast and multicast, HTTP, etc.) mainly designed for " \
        "high-bandwidth networks.\n\n"\
        "For more information, have a look at the web site." )