Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-1.1
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-1.1
Commits
02d360bd
Commit
02d360bd
authored
Jan 25, 2003
by
Eric Petit
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added a window to see vlc messages.
parent
160a693d
Changes
11
Show whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
1068 additions
and
824 deletions
+1068
-824
modules/gui/beos/BeOS.cpp
modules/gui/beos/BeOS.cpp
+2
-1
modules/gui/beos/Interface.cpp
modules/gui/beos/Interface.cpp
+17
-15
modules/gui/beos/InterfaceWindow.cpp
modules/gui/beos/InterfaceWindow.cpp
+671
-635
modules/gui/beos/InterfaceWindow.h
modules/gui/beos/InterfaceWindow.h
+77
-76
modules/gui/beos/MessagesWindow.cpp
modules/gui/beos/MessagesWindow.cpp
+150
-0
modules/gui/beos/MessagesWindow.h
modules/gui/beos/MessagesWindow.h
+51
-0
modules/gui/beos/Modules.am
modules/gui/beos/Modules.am
+2
-0
modules/gui/beos/MsgVals.h
modules/gui/beos/MsgVals.h
+41
-40
modules/gui/beos/PreferencesWindow.cpp
modules/gui/beos/PreferencesWindow.cpp
+36
-38
modules/gui/beos/PreferencesWindow.h
modules/gui/beos/PreferencesWindow.h
+5
-5
modules/gui/beos/VlcWrapper.h
modules/gui/beos/VlcWrapper.h
+16
-14
No files found.
modules/gui/beos/BeOS.cpp
View file @
02d360bd
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
* beos.cpp : BeOS plugin for vlc
* beos.cpp : BeOS plugin for vlc
*****************************************************************************
*****************************************************************************
* Copyright (C) 2000, 2001 VideoLAN
* Copyright (C) 2000, 2001 VideoLAN
* $Id: BeOS.cpp,v 1.
3 2003/01/25 01:03:44
titer Exp $
* $Id: BeOS.cpp,v 1.
4 2003/01/25 20:15:41
titer Exp $
*
*
* Authors: Jean-Marc Dressler <polux@via.ecp.fr>
* Authors: Jean-Marc Dressler <polux@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
* Samuel Hocevar <sam@zoy.org>
...
@@ -59,6 +59,7 @@ vlc_module_begin();
...
@@ -59,6 +59,7 @@ vlc_module_begin();
add_integer
(
"beos-playlist-xpos"
,
0
,
NULL
,
""
,
""
);
add_integer
(
"beos-playlist-xpos"
,
0
,
NULL
,
""
,
""
);
add_integer
(
"beos-playlist-ypos"
,
0
,
NULL
,
""
,
""
);
add_integer
(
"beos-playlist-ypos"
,
0
,
NULL
,
""
,
""
);
add_bool
(
"beos-playlist-show"
,
0
,
NULL
,
""
,
""
);
add_bool
(
"beos-playlist-show"
,
0
,
NULL
,
""
,
""
);
add_bool
(
"beos-messages-show"
,
0
,
NULL
,
""
,
""
);
add_submodule
();
add_submodule
();
set_capability
(
"video output"
,
100
);
set_capability
(
"video output"
,
100
);
set_callbacks
(
E_
(
OpenVideo
),
E_
(
CloseVideo
)
);
set_callbacks
(
E_
(
OpenVideo
),
E_
(
CloseVideo
)
);
...
...
modules/gui/beos/Interface.cpp
View file @
02d360bd
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
* intf_beos.cpp: beos interface
* intf_beos.cpp: beos interface
*****************************************************************************
*****************************************************************************
* Copyright (C) 1999, 2000, 2001 VideoLAN
* Copyright (C) 1999, 2000, 2001 VideoLAN
* $Id: Interface.cpp,v 1.
7 2002/12/09 13:37:38
titer Exp $
* $Id: Interface.cpp,v 1.
8 2003/01/25 20:15:41
titer Exp $
*
*
* Authors: Jean-Marc Dressler <polux@via.ecp.fr>
* Authors: Jean-Marc Dressler <polux@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
* Samuel Hocevar <sam@zoy.org>
...
@@ -55,15 +55,7 @@ static void Run ( intf_thread_t *p_intf );
...
@@ -55,15 +55,7 @@ static void Run ( intf_thread_t *p_intf );
*****************************************************************************/
*****************************************************************************/
int
E_
(
OpenIntf
)
(
vlc_object_t
*
p_this
)
int
E_
(
OpenIntf
)
(
vlc_object_t
*
p_this
)
{
{
intf_thread_t
*
p_intf
=
(
intf_thread_t
*
)
p_this
;
intf_thread_t
*
p_intf
=
(
intf_thread_t
*
)
p_this
;
BScreen
*
screen
;
screen
=
new
BScreen
();
BRect
rect
=
screen
->
Frame
();
rect
.
top
=
rect
.
bottom
-
100
;
rect
.
bottom
-=
50
;
rect
.
left
+=
50
;
rect
.
right
=
rect
.
left
+
350
;
delete
screen
;
/* Allocate instance and initialize some members */
/* Allocate instance and initialize some members */
p_intf
->
p_sys
=
(
intf_sys_t
*
)
malloc
(
sizeof
(
intf_sys_t
)
);
p_intf
->
p_sys
=
(
intf_sys_t
*
)
malloc
(
sizeof
(
intf_sys_t
)
);
...
@@ -73,11 +65,19 @@ int E_(OpenIntf) ( vlc_object_t *p_this )
...
@@ -73,11 +65,19 @@ int E_(OpenIntf) ( vlc_object_t *p_this )
return
(
1
);
return
(
1
);
}
}
p_intf
->
p_sys
->
p_sub
=
msg_Subscribe
(
p_intf
);
p_intf
->
p_sys
->
p_wrapper
=
new
VlcWrapper
(
p_intf
);
p_intf
->
p_sys
->
p_wrapper
=
new
VlcWrapper
(
p_intf
);
p_intf
->
pf_run
=
Run
;
p_intf
->
pf_run
=
Run
;
/* Create the interface window */
/* Create the interface window */
BScreen
*
screen
;
screen
=
new
BScreen
();
BRect
rect
=
screen
->
Frame
();
rect
.
top
=
rect
.
bottom
-
100
;
rect
.
bottom
-=
50
;
rect
.
left
+=
50
;
rect
.
right
=
rect
.
left
+
350
;
delete
screen
;
p_intf
->
p_sys
->
p_window
=
p_intf
->
p_sys
->
p_window
=
new
InterfaceWindow
(
rect
,
new
InterfaceWindow
(
rect
,
VOUT_TITLE
" (BeOS interface)"
,
p_intf
);
VOUT_TITLE
" (BeOS interface)"
,
p_intf
);
...
@@ -105,6 +105,8 @@ void E_(CloseIntf) ( vlc_object_t *p_this )
...
@@ -105,6 +105,8 @@ void E_(CloseIntf) ( vlc_object_t *p_this )
{
{
intf_thread_t
*
p_intf
=
(
intf_thread_t
*
)
p_this
;
intf_thread_t
*
p_intf
=
(
intf_thread_t
*
)
p_this
;
msg_Unsubscribe
(
p_intf
,
p_intf
->
p_sys
->
p_sub
);
/* Destroy the interface window */
/* Destroy the interface window */
p_intf
->
p_sys
->
p_window
->
Lock
();
p_intf
->
p_sys
->
p_window
->
Lock
();
p_intf
->
p_sys
->
p_window
->
Quit
();
p_intf
->
p_sys
->
p_window
->
Quit
();
...
@@ -125,7 +127,7 @@ static void Run( intf_thread_t *p_intf )
...
@@ -125,7 +127,7 @@ static void Run( intf_thread_t *p_intf )
if
(
p_intf
->
p_sys
->
p_wrapper
->
UpdateInputAndAOut
()
)
if
(
p_intf
->
p_sys
->
p_wrapper
->
UpdateInputAndAOut
()
)
{
{
/* Manage the slider */
/* Manage the slider */
p_intf
->
p_sys
->
p_window
->
u
pdateInterface
();
p_intf
->
p_sys
->
p_window
->
U
pdateInterface
();
}
}
/* Wait a bit */
/* Wait a bit */
...
...
modules/gui/beos/InterfaceWindow.cpp
View file @
02d360bd
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
* InterfaceWindow.cpp: beos interface
* InterfaceWindow.cpp: beos interface
*****************************************************************************
*****************************************************************************
* Copyright (C) 1999, 2000, 2001 VideoLAN
* Copyright (C) 1999, 2000, 2001 VideoLAN
* $Id: InterfaceWindow.cpp,v 1.2
1 2003/01/25 01:03:44
titer Exp $
* $Id: InterfaceWindow.cpp,v 1.2
2 2003/01/25 20:15:41
titer Exp $
*
*
* Authors: Jean-Marc Dressler <polux@via.ecp.fr>
* Authors: Jean-Marc Dressler <polux@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
* Samuel Hocevar <sam@zoy.org>
...
@@ -48,6 +48,7 @@
...
@@ -48,6 +48,7 @@
#include "MediaControlView.h"
#include "MediaControlView.h"
#include "PlayListWindow.h"
#include "PlayListWindow.h"
#include "PreferencesWindow.h"
#include "PreferencesWindow.h"
#include "MessagesWindow.h"
#include "InterfaceWindow.h"
#include "InterfaceWindow.h"
#define INTERFACE_UPDATE_TIMEOUT 80000 // 2 frames if at 25 fps
#define INTERFACE_UPDATE_TIMEOUT 80000 // 2 frames if at 25 fps
...
@@ -72,10 +73,6 @@ InterfaceWindow::InterfaceWindow( BRect frame, const char *name,
...
@@ -72,10 +73,6 @@ InterfaceWindow::InterfaceWindow( BRect frame, const char *name,
fPlaylistIsEmpty
=
!
(
p_wrapper
->
PlaylistSize
()
>
0
);
fPlaylistIsEmpty
=
!
(
p_wrapper
->
PlaylistSize
()
>
0
);
fPlaylistWindow
=
new
PlayListWindow
(
BRect
(
100.0
,
100.0
,
400.0
,
350.0
),
"Playlist"
,
this
,
p_intf
);
BScreen
*
p_screen
=
new
BScreen
();
BScreen
*
p_screen
=
new
BScreen
();
BRect
screen_rect
=
p_screen
->
Frame
();
BRect
screen_rect
=
p_screen
->
Frame
();
delete
p_screen
;
delete
p_screen
;
...
@@ -84,9 +81,17 @@ InterfaceWindow::InterfaceWindow( BRect frame, const char *name,
...
@@ -84,9 +81,17 @@ InterfaceWindow::InterfaceWindow( BRect frame, const char *name,
(
screen_rect
.
bottom
-
PREFS_WINDOW_HEIGHT
)
/
2
,
(
screen_rect
.
bottom
-
PREFS_WINDOW_HEIGHT
)
/
2
,
(
screen_rect
.
right
+
PREFS_WINDOW_WIDTH
)
/
2
,
(
screen_rect
.
right
+
PREFS_WINDOW_WIDTH
)
/
2
,
(
screen_rect
.
bottom
+
PREFS_WINDOW_HEIGHT
)
/
2
);
(
screen_rect
.
bottom
+
PREFS_WINDOW_HEIGHT
)
/
2
);
fPreferencesWindow
=
new
PreferencesWindow
(
window_rect
,
fPreferencesWindow
=
new
PreferencesWindow
(
p_intf
,
window_rect
,
"Preferences"
);
"Preferences"
,
window_rect
.
Set
(
screen_rect
.
right
-
500
,
p_intf
);
screen_rect
.
top
+
50
,
screen_rect
.
right
-
150
,
screen_rect
.
top
+
250
);
fPlaylistWindow
=
new
PlayListWindow
(
window_rect
,
"Playlist"
,
this
,
p_intf
);
window_rect
.
Set
(
screen_rect
.
right
-
500
,
screen_rect
.
top
+
300
,
screen_rect
.
right
-
150
,
screen_rect
.
top
+
600
);
fMessagesWindow
=
new
MessagesWindow
(
p_intf
,
window_rect
,
"Messages"
);
// set the title bar
// set the title bar
SetName
(
"interface"
);
SetName
(
"interface"
);
...
@@ -127,10 +132,6 @@ InterfaceWindow::InterfaceWindow( BRect frame, const char *name,
...
@@ -127,10 +132,6 @@ InterfaceWindow::InterfaceWindow( BRect frame, const char *name,
fileMenu
->
AddItem
(
new
BMenuItem
(
"Load a subtitle file"
B_UTF8_ELLIPSIS
,
fileMenu
->
AddItem
(
new
BMenuItem
(
"Load a subtitle file"
B_UTF8_ELLIPSIS
,
new
BMessage
(
LOAD_SUBFILE
)
)
);
new
BMessage
(
LOAD_SUBFILE
)
)
);
fileMenu
->
AddSeparatorItem
();
fileMenu
->
AddItem
(
new
BMenuItem
(
"Play List"
B_UTF8_ELLIPSIS
,
new
BMessage
(
OPEN_PLAYLIST
),
'P'
)
);
fileMenu
->
AddSeparatorItem
();
fileMenu
->
AddSeparatorItem
();
BMenuItem
*
item
=
new
BMenuItem
(
"About"
B_UTF8_ELLIPSIS
,
BMenuItem
*
item
=
new
BMenuItem
(
"About"
B_UTF8_ELLIPSIS
,
new
BMessage
(
B_ABOUT_REQUESTED
),
'A'
);
new
BMessage
(
B_ABOUT_REQUESTED
),
'A'
);
...
@@ -174,11 +175,15 @@ InterfaceWindow::InterfaceWindow( BRect frame, const char *name,
...
@@ -174,11 +175,15 @@ InterfaceWindow::InterfaceWindow( BRect frame, const char *name,
fSpeedMenu
->
SetTargetForItems
(
this
);
fSpeedMenu
->
SetTargetForItems
(
this
);
fMenuBar
->
AddItem
(
fSpeedMenu
);
fMenuBar
->
AddItem
(
fSpeedMenu
);
/* Add the Settings menu */
/* Add the Show menu */
fSettingsMenu
=
new
BMenu
(
"Settings"
);
fShowMenu
=
new
BMenu
(
"Show"
);
fSettingsMenu
->
AddItem
(
fPreferencesMI
=
fShowMenu
->
AddItem
(
new
BMenuItem
(
"Play List"
B_UTF8_ELLIPSIS
,
new
BMenuItem
(
"Preferences"
,
new
BMessage
(
OPEN_PREFERENCES
)
)
);
new
BMessage
(
OPEN_PLAYLIST
),
'P'
)
);
fMenuBar
->
AddItem
(
fSettingsMenu
);
fShowMenu
->
AddItem
(
new
BMenuItem
(
"Messages"
B_UTF8_ELLIPSIS
,
new
BMessage
(
OPEN_MESSAGES
),
'M'
)
);
fShowMenu
->
AddItem
(
new
BMenuItem
(
"Settings"
B_UTF8_ELLIPSIS
,
new
BMessage
(
OPEN_PREFERENCES
),
'S'
)
);
fMenuBar
->
AddItem
(
fShowMenu
);
/* Prepare fow showing */
/* Prepare fow showing */
_SetMenusEnabled
(
false
);
_SetMenusEnabled
(
false
);
...
@@ -214,6 +219,15 @@ InterfaceWindow::InterfaceWindow( BRect frame, const char *name,
...
@@ -214,6 +219,15 @@ InterfaceWindow::InterfaceWindow( BRect frame, const char *name,
fPlaylistWindow
->
Unlock
();
fPlaylistWindow
->
Unlock
();
}
}
}
}
if
(
config_GetInt
(
p_intf
,
"beos-messages-show"
)
)
{
/* messages showing */
if
(
fMessagesWindow
->
Lock
()
)
{
fMessagesWindow
->
Show
();
fMessagesWindow
->
Unlock
();
}
}
Show
();
Show
();
}
}
...
@@ -558,6 +572,7 @@ void InterfaceWindow::MessageReceived( BMessage * p_message )
...
@@ -558,6 +572,7 @@ void InterfaceWindow::MessageReceived( BMessage * p_message )
break
;
break
;
case
OPEN_PREFERENCES
:
case
OPEN_PREFERENCES
:
{
if
(
fPreferencesWindow
->
Lock
()
)
if
(
fPreferencesWindow
->
Lock
()
)
{
{
if
(
fPreferencesWindow
->
IsHidden
())
if
(
fPreferencesWindow
->
IsHidden
())
...
@@ -567,6 +582,20 @@ void InterfaceWindow::MessageReceived( BMessage * p_message )
...
@@ -567,6 +582,20 @@ void InterfaceWindow::MessageReceived( BMessage * p_message )
fPreferencesWindow
->
Unlock
();
fPreferencesWindow
->
Unlock
();
}
}
break
;
break
;
}
case
OPEN_MESSAGES
:
{
if
(
fMessagesWindow
->
Lock
()
)
{
if
(
fMessagesWindow
->
IsHidden
())
fMessagesWindow
->
Show
();
else
fMessagesWindow
->
Activate
();
fMessagesWindow
->
Unlock
();
}
break
;
}
default:
default:
BWindow
::
MessageReceived
(
p_message
);
BWindow
::
MessageReceived
(
p_message
);
...
@@ -599,6 +628,11 @@ bool InterfaceWindow::QuitRequested()
...
@@ -599,6 +628,11 @@ bool InterfaceWindow::QuitRequested()
config_PutInt
(
p_intf
,
"beos-playlist-show"
,
!
fPlaylistWindow
->
IsHidden
()
);
config_PutInt
(
p_intf
,
"beos-playlist-show"
,
!
fPlaylistWindow
->
IsHidden
()
);
fPlaylistWindow
->
Unlock
();
fPlaylistWindow
->
Unlock
();
}
}
if
(
fMessagesWindow
->
Lock
()
)
{
config_PutInt
(
p_intf
,
"beos-messages-show"
,
!
fMessagesWindow
->
IsHidden
()
);
fMessagesWindow
->
Unlock
();
}
config_SaveConfigFile
(
p_intf
,
"beos"
);
config_SaveConfigFile
(
p_intf
,
"beos"
);
p_intf
->
b_die
=
1
;
p_intf
->
b_die
=
1
;
...
@@ -607,9 +641,9 @@ bool InterfaceWindow::QuitRequested()
...
@@ -607,9 +641,9 @@ bool InterfaceWindow::QuitRequested()
}
}
/*****************************************************************************
/*****************************************************************************
* InterfaceWindow::
u
pdateInterface
* InterfaceWindow::
U
pdateInterface
*****************************************************************************/
*****************************************************************************/
void
InterfaceWindow
::
u
pdateInterface
()
void
InterfaceWindow
::
U
pdateInterface
()
{
{
if
(
p_wrapper
->
HasInput
()
)
if
(
p_wrapper
->
HasInput
()
)
{
{
...
@@ -668,6 +702,8 @@ void InterfaceWindow::updateInterface()
...
@@ -668,6 +702,8 @@ void InterfaceWindow::updateInterface()
p_wrapper
->
SetVolume
(
i_volume
);
p_wrapper
->
SetVolume
(
i_volume
);
}
}
fMessagesWindow
->
UpdateMessages
();
fLastUpdateTime
=
system_time
();
fLastUpdateTime
=
system_time
();
}
}
...
...
modules/gui/beos/InterfaceWindow.h
View file @
02d360bd
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
* InterfaceWindow.h: BeOS interface window class prototype
* InterfaceWindow.h: BeOS interface window class prototype
*****************************************************************************
*****************************************************************************
* Copyright (C) 1999, 2000, 2001 VideoLAN
* Copyright (C) 1999, 2000, 2001 VideoLAN
* $Id: InterfaceWindow.h,v 1.
9 2003/01/22 01:13:22
titer Exp $
* $Id: InterfaceWindow.h,v 1.
10 2003/01/25 20:15:41
titer Exp $
*
*
* Authors: Jean-Marc Dressler <polux@via.ecp.fr>
* Authors: Jean-Marc Dressler <polux@via.ecp.fr>
* Tony Castley <tcastley@mail.powerup.com.au>
* Tony Castley <tcastley@mail.powerup.com.au>
...
@@ -35,6 +35,7 @@ class MediaControlView;
...
@@ -35,6 +35,7 @@ class MediaControlView;
class
PlayListWindow
;
class
PlayListWindow
;
class
BFilePanel
;
class
BFilePanel
;
class
PreferencesWindow
;
class
PreferencesWindow
;
class
MessagesWindow
;
class
CDMenu
:
public
BMenu
class
CDMenu
:
public
BMenu
{
{
...
@@ -102,7 +103,7 @@ class InterfaceWindow : public BWindow
...
@@ -102,7 +103,7 @@ class InterfaceWindow : public BWindow
virtual
bool
QuitRequested
();
virtual
bool
QuitRequested
();
// InterfaceWindow
// InterfaceWindow
void
u
pdateInterface
();
void
U
pdateInterface
();
bool
IsStopped
()
const
;
bool
IsStopped
()
const
;
MediaControlView
*
p_mediaControl
;
MediaControlView
*
p_mediaControl
;
...
@@ -123,6 +124,7 @@ class InterfaceWindow : public BWindow
...
@@ -123,6 +124,7 @@ class InterfaceWindow : public BWindow
BFilePanel
*
fSubtitlesPanel
;
BFilePanel
*
fSubtitlesPanel
;
PlayListWindow
*
fPlaylistWindow
;
PlayListWindow
*
fPlaylistWindow
;
PreferencesWindow
*
fPreferencesWindow
;
PreferencesWindow
*
fPreferencesWindow
;
MessagesWindow
*
fMessagesWindow
;
BMenuBar
*
fMenuBar
;
BMenuBar
*
fMenuBar
;
BMenuItem
*
fNextTitleMI
;
BMenuItem
*
fNextTitleMI
;
BMenuItem
*
fPrevTitleMI
;
BMenuItem
*
fPrevTitleMI
;
...
@@ -132,7 +134,6 @@ class InterfaceWindow : public BWindow
...
@@ -132,7 +134,6 @@ class InterfaceWindow : public BWindow
BMenuItem
*
fSlowerMI
;
BMenuItem
*
fSlowerMI
;
BMenuItem
*
fNormalMI
;
BMenuItem
*
fNormalMI
;
BMenuItem
*
fFasterMI
;
BMenuItem
*
fFasterMI
;
BMenuItem
*
fPreferencesMI
;
BMenu
*
fAudioMenu
;
BMenu
*
fAudioMenu
;
BMenu
*
fNavigationMenu
;
BMenu
*
fNavigationMenu
;
BMenu
*
fTitleMenu
;
BMenu
*
fTitleMenu
;
...
@@ -140,7 +141,7 @@ class InterfaceWindow : public BWindow
...
@@ -140,7 +141,7 @@ class InterfaceWindow : public BWindow
BMenu
*
fLanguageMenu
;
BMenu
*
fLanguageMenu
;
BMenu
*
fSubtitlesMenu
;
BMenu
*
fSubtitlesMenu
;
BMenu
*
fSpeedMenu
;
BMenu
*
fSpeedMenu
;
BMenu
*
fSettings
Menu
;
BMenu
*
fShow
Menu
;
bigtime_t
fLastUpdateTime
;
bigtime_t
fLastUpdateTime
;
VlcWrapper
*
p_wrapper
;
VlcWrapper
*
p_wrapper
;
...
...
modules/gui/beos/MessagesWindow.cpp
0 → 100644
View file @
02d360bd
/*****************************************************************************
* MessagesWindow.cpp: beos interface
*****************************************************************************
* Copyright (C) 1999, 2000, 2001 VideoLAN
* $Id: MessagesWindow.cpp,v 1.1 2003/01/25 20:15:41 titer Exp $
*
* Authors: Eric Petit <titer@videolan.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* 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.
*****************************************************************************/
/* BeOS headers */
#include <InterfaceKit.h>
/* VLC headers */
#include <vlc/vlc.h>
#include <vlc/intf.h>
/* BeOS module headers */
#include "VlcWrapper.h"
#include "MessagesWindow.h"
/*****************************************************************************
* MessagesWindow::MessagesWindow
*****************************************************************************/
MessagesWindow
::
MessagesWindow
(
intf_thread_t
*
p_intf
,
BRect
frame
,
const
char
*
name
)
:
BWindow
(
frame
,
name
,
B_FLOATING_WINDOW_LOOK
,
B_NORMAL_WINDOW_FEEL
,
B_NOT_ZOOMABLE
)
{
this
->
p_intf
=
p_intf
;
p_sub
=
p_intf
->
p_sys
->
p_sub
;
BRect
rect
,
rect2
;
rect
=
Bounds
();
rect
.
right
-=
B_V_SCROLL_BAR_WIDTH
;
rect
.
bottom
-=
B_H_SCROLL_BAR_HEIGHT
;
rect2
=
rect
;
rect2
.
InsetBy
(
5
,
5
);
fMessagesView
=
new
BTextView
(
rect
,
"messages"
,
rect2
,
B_FOLLOW_ALL
,
B_WILL_DRAW
);
fMessagesView
->
MakeEditable
(
false
);
fScrollView
=
new
BScrollView
(
"scrollview"
,
fMessagesView
,
B_WILL_DRAW
,
B_FOLLOW_ALL
,
true
,
true
);
fScrollBar
=
fScrollView
->
ScrollBar
(
B_VERTICAL
);
AddChild
(
fScrollView
);
/* start window thread in hidden state */
Hide
();
Show
();
}
/*****************************************************************************
* MessagesWindow::~MessagesWindow
*****************************************************************************/
MessagesWindow
::~
MessagesWindow
()
{
}
/*****************************************************************************
* MessagesWindow::QuitRequested
*****************************************************************************/
bool
MessagesWindow
::
QuitRequested
()
{
Hide
();
return
false
;
}
/*****************************************************************************
* MessagesWindow::ReallyQuit
*****************************************************************************/
void
MessagesWindow
::
ReallyQuit
()
{
Hide
();
Quit
();
}
/*****************************************************************************
* MessagesWindow::UpdateMessages
*****************************************************************************/
void
MessagesWindow
::
UpdateMessages
()
{
int
i_start
;
vlc_mutex_lock
(
p_sub
->
p_lock
);
int
i_stop
=
*
p_sub
->
pi_stop
;
vlc_mutex_unlock
(
p_sub
->
p_lock
);
if
(
p_sub
->
i_start
!=
i_stop
)
{
for
(
i_start
=
p_sub
->
i_start
;
i_start
!=
i_stop
;
i_start
=
(
i_start
+
1
)
%
VLC_MSG_QSIZE
)
{
/* Append all messages to log window */
/* textctrl->SetDefaultStyle( *dbg_attr );
(*textctrl) << p_sub->p_msg[i_start].psz_module; */
/* switch( p_sub->p_msg[i_start].i_type )
{
case VLC_MSG_INFO:
(*textctrl) << ": ";
textctrl->SetDefaultStyle( *info_attr );
break;
case VLC_MSG_ERR:
(*textctrl) << " error: ";
textctrl->SetDefaultStyle( *err_attr );
break;
case VLC_MSG_WARN:
(*textctrl) << " warning: ";
textctrl->SetDefaultStyle( *warn_attr );
break;
case VLC_MSG_DBG:
default:
(*textctrl) << " debug: ";
break;
} */
/* Add message */
fMessagesView
->
LockLooper
();
fMessagesView
->
Insert
(
p_sub
->
p_msg
[
i_start
].
psz_msg
);
fMessagesView
->
Insert
(
"
\n
"
);
fMessagesView
->
UnlockLooper
();
/* Scroll at the end */
fScrollBar
->
LockLooper
();
float
min
,
max
;
fScrollBar
->
GetRange
(
&
min
,
&
max
);
fScrollBar
->
SetValue
(
max
);
fScrollBar
->
UnlockLooper
();
}
vlc_mutex_lock
(
p_sub
->
p_lock
);
p_sub
->
i_start
=
i_start
;
vlc_mutex_unlock
(
p_sub
->
p_lock
);
}
}
modules/gui/beos/MessagesWindow.h
0 → 100644
View file @
02d360bd
/*****************************************************************************
* MessagesWindow.h
*****************************************************************************
* Copyright (C) 1999, 2000, 2001 VideoLAN
* $Id: MessagesWindow.h,v 1.1 2003/01/25 20:15:41 titer Exp $
*
* Authors: Eric Petit <titer@videolan.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* 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.
*****************************************************************************/
#ifndef BEOS_MESSAGES_WINDOW_H
#define BEOS_MESSAGES_WINDOW_H
#include <Window.h>
class
MessagesWindow
:
public
BWindow
{
public:
MessagesWindow
(
intf_thread_t
*
p_intf
,
BRect
frame
,
const
char
*
name
);
virtual
~
MessagesWindow
();
virtual
bool
QuitRequested
();
void
ReallyQuit
();
void
UpdateMessages
();
private:
intf_thread_t
*
p_intf
;
msg_subscription_t
*
p_sub
;
BView
*
fBackgroundView
;
BTextView
*
fMessagesView
;
BScrollView
*
fScrollView
;
BScrollBar
*
fScrollBar
;
};
#endif // BEOS_PREFERENCES_WINDOW_H
modules/gui/beos/Modules.am
View file @
02d360bd
...
@@ -15,6 +15,8 @@ SOURCES_beos = \
...
@@ -15,6 +15,8 @@ SOURCES_beos = \
modules/gui/beos/PlayListWindow.h \
modules/gui/beos/PlayListWindow.h \
modules/gui/beos/PreferencesWindow.cpp \
modules/gui/beos/PreferencesWindow.cpp \
modules/gui/beos/PreferencesWindow.h \
modules/gui/beos/PreferencesWindow.h \
modules/gui/beos/MessagesWindow.cpp \
modules/gui/beos/MessagesWindow.h \
modules/gui/beos/MediaControlView.cpp \
modules/gui/beos/MediaControlView.cpp \
modules/gui/beos/MediaControlView.h \
modules/gui/beos/MediaControlView.h \
modules/gui/beos/VlcWrapper.cpp \
modules/gui/beos/VlcWrapper.cpp \
...
...
modules/gui/beos/MsgVals.h
View file @
02d360bd
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
* MsgVals.h
* MsgVals.h
*****************************************************************************
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* Copyright (C) 2001 VideoLAN
* $Id: MsgVals.h,v 1.
4 2003/01/14 14:48:55
titer Exp $
* $Id: MsgVals.h,v 1.
5 2003/01/25 20:15:41
titer Exp $
*
*
* Authors: Tony Castley <tcastley@mail.powerup.com.au>
* Authors: Tony Castley <tcastley@mail.powerup.com.au>
* Stephan Aßmus <stippi@yellowbites.com>
* Stephan Aßmus <stippi@yellowbites.com>
...
@@ -55,6 +55,7 @@ const uint32 NEXT_FILE = 'nxfl';
...
@@ -55,6 +55,7 @@ const uint32 NEXT_FILE = 'nxfl';
const
uint32
NAVIGATE_PREV
=
'
navp
'
;
// could be chapter, title or file
const
uint32
NAVIGATE_PREV
=
'
navp
'
;
// could be chapter, title or file
const
uint32
NAVIGATE_NEXT
=
'
navn
'
;
// could be chapter, title or file
const
uint32
NAVIGATE_NEXT
=
'
navn
'
;
// could be chapter, title or file
const
uint32
OPEN_PREFERENCES
=
'
pref
'
;
const
uint32
OPEN_PREFERENCES
=
'
pref
'
;
const
uint32
OPEN_MESSAGES
=
'
mess
'
;
const
uint32
TOGGLE_ON_TOP
=
'
ontp
'
;
const
uint32
TOGGLE_ON_TOP
=
'
ontp
'
;
const
uint32
TOGGLE_FULL_SCREEN
=
'
tgfs
'
;
const
uint32
TOGGLE_FULL_SCREEN
=
'
tgfs
'
;
const
uint32
RESIZE_50
=
'
rshl
'
;
const
uint32
RESIZE_50
=
'
rshl
'
;
...
...
modules/gui/beos/PreferencesWindow.cpp
View file @
02d360bd
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
* PreferencesWindow.cpp: beos interface
* PreferencesWindow.cpp: beos interface
*****************************************************************************
*****************************************************************************
* Copyright (C) 1999, 2000, 2001 VideoLAN
* Copyright (C) 1999, 2000, 2001 VideoLAN
* $Id: PreferencesWindow.cpp,v 1.
8 2003/01/17 18:19:43
titer Exp $
* $Id: PreferencesWindow.cpp,v 1.
9 2003/01/25 20:15:41
titer Exp $
*
*
* Authors: Eric Petit <titer@videolan.org>
* Authors: Eric Petit <titer@videolan.org>
*
*
...
@@ -37,12 +37,12 @@
...
@@ -37,12 +37,12 @@
/*****************************************************************************
/*****************************************************************************
* Preferences::PreferencesWindow
* Preferences::PreferencesWindow
*****************************************************************************/
*****************************************************************************/
PreferencesWindow
::
PreferencesWindow
(
BRect
frame
,
const
char
*
name
,
PreferencesWindow
::
PreferencesWindow
(
intf_thread_t
*
p_intf
,
intf_thread_t
*
p_interfac
e
)
BRect
frame
,
const
char
*
nam
e
)
:
BWindow
(
frame
,
name
,
B_FLOATING_WINDOW_LOOK
,
B_NORMAL_WINDOW_FEEL
,
:
BWindow
(
frame
,
name
,
B_FLOATING_WINDOW_LOOK
,
B_NORMAL_WINDOW_FEEL
,
B_NOT_ZOOMABLE
|
B_NOT_RESIZABLE
|
B_NOT_CLOSABLE
)
B_NOT_ZOOMABLE
|
B_NOT_RESIZABLE
|
B_NOT_CLOSABLE
)
{
{
p_intf
=
p_interface
;
this
->
p_intf
=
p_intf
;
BRect
rect
;
BRect
rect
;
/* "background" view */
/* "background" view */
...
@@ -132,8 +132,6 @@ PreferencesWindow::PreferencesWindow( BRect frame, const char* name,
...
@@ -132,8 +132,6 @@ PreferencesWindow::PreferencesWindow( BRect frame, const char* name,
rect
.
top
=
rect
.
bottom
-
10
;
rect
.
top
=
rect
.
bottom
-
10
;
fRestartString
=
new
BStringView
(
rect
,
NULL
,
fRestartString
=
new
BStringView
(
rect
,
NULL
,
"Warning: changing settings after starting playback may have no effect."
);
"Warning: changing settings after starting playback may have no effect."
);
/*rgb_color redColor = {255, 0, 0, 255};
fRestartString->SetHighColor(redColor);*/
fRestartString
->
SetAlignment
(
B_ALIGN_CENTER
);
fRestartString
->
SetAlignment
(
B_ALIGN_CENTER
);
fPrefsView
->
AddChild
(
fRestartString
);
fPrefsView
->
AddChild
(
fRestartString
);
...
...
modules/gui/beos/PreferencesWindow.h
View file @
02d360bd
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
* PreferencesWindow.h
* PreferencesWindow.h
*****************************************************************************
*****************************************************************************
* Copyright (C) 1999, 2000, 2001 VideoLAN
* Copyright (C) 1999, 2000, 2001 VideoLAN
* $Id: PreferencesWindow.h,v 1.
6 2003/01/17 18:19:43
titer Exp $
* $Id: PreferencesWindow.h,v 1.
7 2003/01/25 20:15:41
titer Exp $
*
*
* Authors: Eric Petit <titer@videolan.org>
* Authors: Eric Petit <titer@videolan.org>
*
*
...
@@ -38,9 +38,9 @@
...
@@ -38,9 +38,9 @@
class
PreferencesWindow
:
public
BWindow
class
PreferencesWindow
:
public
BWindow
{
{
public:
public:
PreferencesWindow
(
BRect
frame
,
PreferencesWindow
(
intf_thread_t
*
p_intf
,
const
char
*
n
ame
,
BRect
fr
ame
,
intf_thread_t
*
p_interfac
e
);
const
char
*
nam
e
);
virtual
~
PreferencesWindow
();
virtual
~
PreferencesWindow
();
virtual
void
MessageReceived
(
BMessage
*
message
);
virtual
void
MessageReceived
(
BMessage
*
message
);
void
ReallyQuit
();
void
ReallyQuit
();
...
...
modules/gui/beos/VlcWrapper.h
View file @
02d360bd
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
* VlcWrapper.h: BeOS plugin for vlc (derived from MacOS X port)
* VlcWrapper.h: BeOS plugin for vlc (derived from MacOS X port)
*****************************************************************************
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* Copyright (C) 2001 VideoLAN
* $Id: VlcWrapper.h,v 1.1
5 2003/01/22 01:13:22
titer Exp $
* $Id: VlcWrapper.h,v 1.1
6 2003/01/25 20:15:41
titer Exp $
*
*
* Authors: Florian G. Pflug <fgp@phlo.org>
* Authors: Florian G. Pflug <fgp@phlo.org>
* Jon Lech Johansen <jon-vl@nanocrew.net>
* Jon Lech Johansen <jon-vl@nanocrew.net>
...
@@ -35,6 +35,8 @@ class VlcWrapper;
...
@@ -35,6 +35,8 @@ class VlcWrapper;
*****************************************************************************/
*****************************************************************************/
struct
intf_sys_t
struct
intf_sys_t
{
{
msg_subscription_t
*
p_sub
;
InterfaceWindow
*
p_window
;
InterfaceWindow
*
p_window
;
vlc_bool_t
b_loop
;
vlc_bool_t
b_loop
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment