Commit e1522ec4 authored by Derk-Jan Hartman's avatar Derk-Jan Hartman

* Added an info panel to show movie info, etc.

parent 89c55386
$Id: NEWS,v 1.19 2003/02/16 01:38:36 titer Exp $
$Id: NEWS,v 1.20 2003/02/16 23:32:05 hartman Exp $
Changes between 0.5.0 and 0.5.1:
--------------------------------
......@@ -33,14 +33,15 @@ UNIX ports:
Mac OS X port:
* fixed a crash on start-up on some localized systems
* lower real-time priorities to avoid lock-up on slow machines
* VLC can now be made handler of ftp http mms and udp URLs
* lowered real-time priorities to avoid lock-up on slow machines
* VLC can now be made the handler of ftp http mms and udp URLs
* playlist enhancements
* added half, normal and double video window menu items
* new step forward/step backward commands
* the dock should no longer be visible in fullscreen mode
* the Mac OS X binary is now compiled with Ogg/theora support
* vlc.app is now VLC.app
* added an info panel
Win32 port:
* fixed the "RichEdit line insertion error" bug
......
......@@ -35,6 +35,13 @@
OUTLETS = {"o_main" = id; "o_open" = id; "o_volumeslider" = id; };
SUPERCLASS = NSObject;
},
{
ACTIONS = {showCategory = id; toggleInfoPanel = id; };
CLASS = VLCInfo;
LANGUAGE = ObjC;
OUTLETS = {"o_info_selector" = id; "o_info_view" = id; "o_info_window" = id; };
SUPERCLASS = NSObject;
},
{
ACTIONS = {
clearRecentItems = id;
......@@ -70,6 +77,8 @@
"o_err_lbl" = id;
"o_err_msg" = id;
"o_error" = id;
"o_info" = id;
"o_info_window" = id;
"o_messages" = id;
"o_mi_about" = id;
"o_mi_bring_atf" = id;
......@@ -90,6 +99,7 @@
"o_mi_half_window" = id;
"o_mi_hide" = id;
"o_mi_hide_others" = id;
"o_mi_info" = id;
"o_mi_language" = id;
"o_mi_license" = id;
"o_mi_loop" = id;
......@@ -190,11 +200,6 @@
"o_file_sub_path" = id;
"o_mrl" = id;
"o_mrl_lbl" = id;
"o_net_cs_addr" = id;
"o_net_cs_addr_lbl" = id;
"o_net_cs_port" = id;
"o_net_cs_port_lbl" = id;
"o_net_cs_port_stp" = id;
"o_net_http_url" = id;
"o_net_http_url_lbl" = id;
"o_net_mode" = id;
......
......@@ -3,11 +3,11 @@
<plist version="1.0">
<dict>
<key>IBDocumentLocation</key>
<string>469 64 365 441 0 0 1152 746 </string>
<string>65 171 365 441 0 0 1280 1002 </string>
<key>IBEditorPositions</key>
<dict>
<key>29</key>
<string>14 602 419 44 0 0 1152 746 </string>
<string>16 822 419 44 0 0 1280 1002 </string>
<key>303</key>
<string>60 509 104 114 0 0 1280 1002 </string>
<key>909</key>
......@@ -23,8 +23,8 @@
</array>
<key>IBOpenObjects</key>
<array>
<integer>636</integer>
<integer>29</integer>
<integer>1194</integer>
</array>
<key>IBSystem Version</key>
<string>6I32</string>
......
......@@ -501,6 +501,8 @@
8ED6C27B03E2EB1C0059A3A7,
8ED6C27C03E2EB1C0059A3A7,
8ED6C27D03E2EB1C0059A3A7,
8EF1600B03FC62560059A3A7,
8EF1600C03FC62560059A3A7,
8ED6C27E03E2EB1C0059A3A7,
8ED6C27F03E2EB1C0059A3A7,
8ED6C28003E2EB1C0059A3A7,
......@@ -771,6 +773,20 @@
settings = {
};
};
8EF1600B03FC62560059A3A7 = {
fileEncoding = 4;
isa = PBXFileReference;
name = info.h;
path = ../../modules/gui/macosx/info.h;
refType = 2;
};
8EF1600C03FC62560059A3A7 = {
fileEncoding = 4;
isa = PBXFileReference;
name = info.m;
path = ../../modules/gui/macosx/info.m;
refType = 2;
};
//8E0
//8E1
//8E2
......
......@@ -6,6 +6,8 @@ SOURCES_macosx = \
modules/gui/macosx/intf.m \
modules/gui/macosx/intf.h \
modules/gui/macosx/open.m \
modules/gui/macosx/info.h \
modules/gui/macosx/info.m \
modules/gui/macosx/open.h \
modules/gui/macosx/prefs.m \
modules/gui/macosx/prefs.h \
......
......@@ -2,7 +2,7 @@
* intf.h: MacOS X interface plugin
*****************************************************************************
* Copyright (C) 2002 VideoLAN
* $Id: intf.h,v 1.27 2003/02/13 14:16:41 hartman Exp $
* $Id: intf.h,v 1.28 2003/02/16 23:32:06 hartman Exp $
*
* Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
* Christophe Massiot <massiot@via.ecp.fr>
......@@ -114,6 +114,7 @@ struct intf_sys_t
IBOutlet id o_controls; /* VLCControls */
IBOutlet id o_playlist; /* VLCPlaylist */
IBOutlet id o_info; /* VLCInfo */
IBOutlet id o_messages; /* messages tv */
IBOutlet id o_msgs_panel; /* messages panel */
......@@ -128,6 +129,8 @@ struct intf_sys_t
IBOutlet id o_err_bug_lbl;
IBOutlet id o_err_btn_msgs; /* Open Messages */
IBOutlet id o_err_btn_dismiss;
IBOutlet id o_info_window; /* Info panel */
/* main menu */
......@@ -189,6 +192,7 @@ struct intf_sys_t
IBOutlet id o_mi_close_window;
IBOutlet id o_mi_controller;
IBOutlet id o_mi_playlist;
IBOutlet id o_mi_info;
IBOutlet id o_mi_messages;
IBOutlet id o_mi_bring_atf;
......
......@@ -2,7 +2,7 @@
* intf.m: MacOS X interface plugin
*****************************************************************************
* Copyright (C) 2002-2003 VideoLAN
* $Id: intf.m,v 1.57 2003/02/13 14:16:41 hartman Exp $
* $Id: intf.m,v 1.58 2003/02/16 23:32:06 hartman Exp $
*
* Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
* Christophe Massiot <massiot@via.ecp.fr>
......@@ -34,6 +34,7 @@
#include "vout.h"
#include "prefs.h"
#include "playlist.h"
#include "info.h"
/*****************************************************************************
* Local prototypes.
......@@ -349,6 +350,7 @@ int ExecuteOnMainThread( id target, SEL sel, void * p_arg )
[o_mi_close_window setTitle: _NS("Close Window")];
[o_mi_controller setTitle: _NS("Controller")];
[o_mi_playlist setTitle: _NS("Playlist")];
[o_mi_info setTitle: _NS("Info")];
[o_mi_messages setTitle: _NS("Messages")];
[o_mi_bring_atf setTitle: _NS("Bring All to Front")];
......@@ -372,6 +374,8 @@ int ExecuteOnMainThread( id target, SEL sel, void * p_arg )
[o_err_btn_msgs setTitle: _NS("Open Messages Window")];
[o_err_btn_dismiss setTitle: _NS("Dismiss")];
[o_info_window setTitle: _NS("Info")];
[self setSubmenusEnabled: FALSE];
[self manageVolumeSlider];
}
......@@ -638,6 +642,12 @@ int ExecuteOnMainThread( id target, SEL sel, void * p_arg )
vlc_mutex_unlock( &p_playlist->object_lock );
[o_playlist updateState];
vlc_mutex_lock( &p_playlist->object_lock );
if( p_input != NULL )
{
vlc_mutex_unlock( &p_input->stream.stream_lock );
[o_info updateInfo];
vlc_mutex_lock( &p_input->stream.stream_lock );
}
p_intf->p_sys->b_current_title_update = FALSE;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment