mirrors/vlc
0
0
Fork 0
mirror of https://github.com/videolan/vlc.git synced 2024-11-25 02:44:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

* ALL: bumped version number to 0.6.2-cvs

Browse Source 
* modules/video_output/x11/xcommon.c: closing the video window or using the escape key doesn't exit VLC anymore but stop the input instead.
This commit is contained in:
Gildas Bazin 2003-08-02 14:06:23 +00:00
parent 537cb4837b
commit da8662892e
5 changed files with 32 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
NEWS
View File

@ -1,4 +1,7 @@
$Id: NEWS,v 1.60 2003/07/28 20:23:58 jpsaman Exp $
$Id: NEWS,v 1.61 2003/08/02 14:06:22 gbazin Exp $
Changes between 0.6.1 and 0.6.2:
---------------------------------
Changes between 0.6.0 and 0.6.1:
---------------------------------

6
configure.ac
View File

@ -1,7 +1,7 @@
dnl Autoconf settings for vlc
dnl $Id: configure.ac,v 1.51 2003/08/01 00:40:05 fenrir Exp $
dnl $Id: configure.ac,v 1.52 2003/08/02 14:06:22 gbazin Exp $
AC_INIT(vlc,0.6.1)
AC_INIT(vlc,0.6.2-cvs)
CONFIGURE_LINE="$0 $*"
CODENAME="Trevelyan"
@ -13,7 +13,7 @@ AC_CANONICAL_SYSTEM
dnl XXX: we don't put any flags here, because automake 1.5 doesn't support
dnl them. And we need the comma otherwize automake will choke on it.
AM_INIT_AUTOMAKE(vlc,0.6.1)
AM_INIT_AUTOMAKE(vlc,0.6.2-cvs)
AM_CONFIG_HEADER(config.h)
dnl

4
extras/MacOSX/Resources/English.lproj/InfoPlist.strings
View File

@ -1,6 +1,6 @@
/* Localized versions of Info.plist keys */
CFBundleName = "VLC";
CFBundleShortVersionString = "0.6.1";
CFBundleGetInfoString = "VLC media player 0.6.1, Copyright (c) 1996-2003 VideoLAN.";
CFBundleShortVersionString = "0.6.2-cvs";
CFBundleGetInfoString = "VLC media player 0.6.2-cvs, Copyright (c) 1996-2003 VideoLAN.";
NSHumanReadableCopyright = "Copyright (c) 1996-2003 VideoLAN.";

6
extras/MacOSX/vlc.pbproj/project.pbxproj
View File

@ -415,7 +415,7 @@
<key>CFBundleExecutable</key>
<string>VLC</string>
<key>CFBundleGetInfoString</key>
<string>VLC media player 0.6.1, Copyright (c) 1996-2003 VideoLAN.</string>
<string>VLC media player 0.6.2-cvs, Copyright (c) 1996-2003 VideoLAN.</string>
<key>CFBundleIconFile</key>
<string>vlc.icns</string>
<key>CFBundleIdentifier</key>
@ -427,7 +427,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>0.6.1</string>
<string>0.6.2-cvs</string>
<key>CFBundleSignature</key>
<string>VLC#</string>
<key>CFBundleURLTypes</key>
@ -474,7 +474,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
<string>0.6.1</string>
<string>0.6.2-cvs</string>
<key>NSAppleScriptEnabled</key>
<string>YES</string>
<key>NSMainNibFile</key>

23
modules/video_output/x11/xcommon.c
View File

@ -2,7 +2,7 @@
* xcommon.c: Functions common to the X11 and XVideo plugins
*****************************************************************************
* Copyright (C) 1998-2001 VideoLAN
* $Id: xcommon.c,v 1.26 2003/07/29 21:14:10 gbazin Exp $
* $Id: xcommon.c,v 1.27 2003/08/02 14:06:22 gbazin Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
@ -525,7 +525,16 @@ static int ManageVideo( vout_thread_t *p_vout )
}
else
{
p_vout->p_vlc->b_die = 1;
/* the user wants to close the window */
playlist_t * p_playlist =
(playlist_t *)vlc_object_find( p_vout,
VLC_OBJECT_PLAYLIST,
FIND_ANYWHERE );
if( p_playlist != NULL )
{
playlist_Stop( p_playlist );
vlc_object_release( p_playlist );
}
}
break;
case XK_Menu:
@ -820,7 +829,15 @@ static int ManageVideo( vout_thread_t *p_vout )
&& ((Atom)xevent.xclient.data.l[0]
== p_vout->p_sys->p_win->wm_delete_window ) )
{
p_vout->p_vlc->b_die = 1;
/* the user wants to close the window */
playlist_t * p_playlist =
(playlist_t *)vlc_object_find( p_vout, VLC_OBJECT_PLAYLIST,
FIND_ANYWHERE );
if( p_playlist != NULL )
{
playlist_Stop( p_playlist );
vlc_object_release( p_playlist );
}
}
}