Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Steve Lhomme
VLC
Commits
1e803bea
Commit
1e803bea
authored
Jun 01, 2002
by
Tony Castley
Browse files
Fixes for preventing multiple playlist windows
and improvements and corrections in videoout.
parent
4754b3a0
Changes
2
Hide whitespace changes
Inline
Side-by-side
plugins/beos/InterfaceWindow.cpp
View file @
1e803bea
...
...
@@ -2,7 +2,7 @@
* InterfaceWindow.cpp: beos interface
*****************************************************************************
* Copyright (C) 1999, 2000, 2001 VideoLAN
* $Id: InterfaceWindow.cpp,v 1.1
6
2002/0
5/16 11:38:42
tcastley Exp $
* $Id: InterfaceWindow.cpp,v 1.1
7
2002/0
6/01 09:21:59
tcastley Exp $
*
* Authors: Jean-Marc Dressler <polux@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
...
...
@@ -53,8 +53,9 @@ extern "C"
/* BeOS interface headers */
#include "MsgVals.h"
#include "MediaControlView.h"
#include "InterfaceWindow.h"
#include "PlayListWindow.h"
#include "InterfaceWindow.h"
/*****************************************************************************
* InterfaceWindow
...
...
@@ -67,6 +68,7 @@ InterfaceWindow::InterfaceWindow( BRect frame, const char *name,
|
B_ASYNCHRONOUS_CONTROLS
)
{
file_panel
=
NULL
;
playlist_window
=
NULL
;
p_intf
=
p_interface
;
BRect
controlRect
(
0
,
0
,
0
,
0
);
b_empty_playlist
=
(
p_main
->
p_playlist
->
i_size
<
0
);
...
...
@@ -149,6 +151,7 @@ InterfaceWindow::InterfaceWindow( BRect frame, const char *name,
InterfaceWindow
::~
InterfaceWindow
()
{
if
(
playlist_window
)
playlist_window
->
ReallyQuit
();
}
/*****************************************************************************
...
...
@@ -208,9 +211,9 @@ void InterfaceWindow::MessageReceived( BMessage * p_message )
case
OPEN_PLAYLIST
:
{
BRect
rect
(
20
,
20
,
320
,
420
);
P
lay
L
ist
W
indow
*
p
lay
l
ist
_w
indow
=
new
PlayList
Window
(
rect
,
"Playlist"
,
(
playlist_t
*
)
p_main
->
p_playlist
);
playlist_window
->
Show
();
p
lay
l
ist
_w
indow
=
P
lay
L
ist
W
indow
::
get
PlayList
(
rect
,
"Playlist"
,
(
playlist_t
*
)
p_main
->
p_playlist
);
playlist_window
->
Show
();
}
break
;
case
OPEN_DVD
:
...
...
plugins/beos/vout_beos.cpp
View file @
1e803bea
...
...
@@ -2,7 +2,7 @@
* vout_beos.cpp: beos video output display method
*****************************************************************************
* Copyright (C) 2000, 2001 VideoLAN
* $Id: vout_beos.cpp,v 1.5
8
2002/0
5/30 08:17:04 gbazin
Exp $
* $Id: vout_beos.cpp,v 1.5
9
2002/0
6/01 09:21:59 tcastley
Exp $
*
* Authors: Jean-Marc Dressler <polux@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
...
...
@@ -153,6 +153,11 @@ VideoWindow::~VideoWindow()
delete
bitmap
[
2
];
}
bool
VideoWindow
::
QuitRequested
()
{
return
true
;
}
void
VideoWindow
::
drawBuffer
(
int
bufferIndex
)
{
status_t
status
;
...
...
@@ -178,7 +183,7 @@ void VideoWindow::drawBuffer(int bufferIndex)
&
key
,
B_FOLLOW_ALL
,
B_OVERLAY_FILTER_HORIZONTAL
|
B_OVERLAY_FILTER_VERTICAL
|
B_OVERLAY_TRANSFER_CHANNEL
);
view
->
SetViewColor
(
key
);
//
view->SetViewColor(key);
}
else
{
...
...
@@ -284,7 +289,7 @@ int VideoWindow::SelectDrawingMode(int width, int height)
{
if
(
noOverlay
)
break
;
bitmap
[
0
]
=
new
BBitmap
(
BRect
(
0
,
0
,
width
,
height
),
B_BITMAP_WILL_OVERLAY
|
B_BITMAP_RESERVE_OVERLAY_CHANNEL
,
B_BITMAP_WILL_OVERLAY
,
colspace
[
i
].
colspace
);
if
(
bitmap
[
0
]
&&
bitmap
[
0
]
->
InitCheck
()
==
B_OK
)
...
...
@@ -573,8 +578,8 @@ static int BeosOpenDisplay( vout_thread_t *p_vout )
p_vout
->
p_sys
->
p_window
=
new
VideoWindow
(
p_vout
->
p_sys
->
i_width
-
1
,
p_vout
->
p_sys
->
i_height
-
1
,
BRect
(
20
,
50
,
20
+
p_vout
->
i_window_width
-
1
,
50
+
p_vout
->
i_window_height
));
20
+
p_vout
->
i_window_width
-
1
,
50
+
p_vout
->
i_window_height
-
1
));
if
(
p_vout
->
p_sys
->
p_window
==
NULL
)
{
...
...
@@ -602,6 +607,7 @@ static void BeosCloseDisplay( vout_thread_t *p_vout )
p_win
->
Hide
();
p_win
->
Quit
();
}
p_win
=
NULL
;
}
...
...
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