* InterfaceWindow.cpp: beos interface
*****************************************************************************
* Copyright (C) 1999, 2000, 2001 VideoLAN
- * $Id: InterfaceWindow.cpp,v 1.16 2002/05/16 11:38:42 tcastley Exp $
+ * $Id: InterfaceWindow.cpp,v 1.17 2002/06/01 09:21:59 tcastley Exp $
*
* Authors: Jean-Marc Dressler <polux@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
/* BeOS interface headers */
#include "MsgVals.h"
#include "MediaControlView.h"
-#include "InterfaceWindow.h"
#include "PlayListWindow.h"
+#include "InterfaceWindow.h"
+
/*****************************************************************************
* InterfaceWindow
| 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);
InterfaceWindow::~InterfaceWindow()
{
+ if (playlist_window) playlist_window->ReallyQuit();
}
/*****************************************************************************
case OPEN_PLAYLIST:
{
BRect rect(20,20,320,420);
- PlayListWindow* playlist_window = new PlayListWindow(rect,
- "Playlist", (playlist_t *)p_main->p_playlist);
- playlist_window->Show();
+ playlist_window = PlayListWindow::getPlayList(rect,
+ "Playlist", (playlist_t *)p_main->p_playlist);
+ playlist_window->Show();
}
break;
case OPEN_DVD:
* vout_beos.cpp: beos video output display method
*****************************************************************************
* Copyright (C) 2000, 2001 VideoLAN
- * $Id: vout_beos.cpp,v 1.58 2002/05/30 08:17:04 gbazin Exp $
+ * $Id: vout_beos.cpp,v 1.59 2002/06/01 09:21:59 tcastley Exp $
*
* Authors: Jean-Marc Dressler <polux@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
delete bitmap[2];
}
+bool VideoWindow::QuitRequested()
+{
+ return true;
+}
+
void VideoWindow::drawBuffer(int bufferIndex)
{
status_t status;
&key, B_FOLLOW_ALL,
B_OVERLAY_FILTER_HORIZONTAL|B_OVERLAY_FILTER_VERTICAL|
B_OVERLAY_TRANSFER_CHANNEL);
- view->SetViewColor(key);
+ //view->SetViewColor(key);
}
else
{
{
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)
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 )
{
p_win->Hide();
p_win->Quit();
}
+ p_win = NULL;
}