/*****************************************************************************
* MessagesWindow.cpp: beos interface
*****************************************************************************
- * Copyright (C) 1999, 2000, 2001 VideoLAN
- * $Id: MessagesWindow.cpp,v 1.11 2003/05/18 22:30:33 titer Exp $
+ * Copyright (C) 1999, 2000, 2001 the VideoLAN team
+ * $Id$
*
* Authors: Eric Petit <titer@videolan.org>
*
*
* 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.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/* BeOS headers */
#include <SupportKit.h>
/* VLC headers */
-#include <vlc/vlc.h>
-#include <vlc/intf.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
+#include <vlc_interface.h>
/* BeOS module headers */
-#include "VlcWrapper.h"
#include "InterfaceWindow.h"
#include "MessagesWindow.h"
if( fScrollBar->Value() != max )
isScrolling = true;
fScrollBar->UnlockLooper();
-
+
}
int i_start, oldLength;
- char * psz_module_type = NULL;
+ const char * psz_module_type = NULL;
rgb_color red = { 200, 0, 0 };
rgb_color gray = { 150, 150, 150 };
rgb_color green = { 0, 150, 0 };
case VLC_MSG_DBG: color = gray; break;
}
- switch( p_sub->p_msg[i_start].i_object_type )
- {
- case VLC_OBJECT_ROOT: psz_module_type = "root"; break;
- case VLC_OBJECT_VLC: psz_module_type = "vlc"; break;
- case VLC_OBJECT_MODULE: psz_module_type = "module"; break;
- case VLC_OBJECT_INTF: psz_module_type = "interface"; break;
- case VLC_OBJECT_PLAYLIST: psz_module_type = "playlist"; break;
- case VLC_OBJECT_ITEM: psz_module_type = "item"; break;
- case VLC_OBJECT_INPUT: psz_module_type = "input"; break;
- case VLC_OBJECT_DECODER: psz_module_type = "decoder"; break;
- case VLC_OBJECT_VOUT: psz_module_type = "video output"; break;
- case VLC_OBJECT_AOUT: psz_module_type = "audio output"; break;
- case VLC_OBJECT_SOUT: psz_module_type = "stream output"; break;
- }
+ psz_module_type = p_sub->p_msg[i_start].psz_object_type;
if( LockLooper() )
{
oldLength = TextLength();
- BString string;
- string << p_sub->p_msg[i_start].psz_module
- << " " << psz_module_type << " : "
- << p_sub->p_msg[i_start].psz_msg << "\n";
- Insert( TextLength(), string.String(), strlen( string.String() ) );
- SetFontAndColor( oldLength, TextLength(), NULL, 0, &color );
- Draw( Bounds() );
- UnlockLooper();
+ BString string;
+ string << p_sub->p_msg[i_start].psz_module
+ << " " << psz_module_type << " : "
+ << p_sub->p_msg[i_start].psz_msg << "\n";
+ Insert( TextLength(), string.String(), strlen( string.String() ) );
+ SetFontAndColor( oldLength, TextLength(), NULL, 0, &color );
+ Draw( Bounds() );
+ UnlockLooper();
}
}
/*****************************************************************************
* MessagesWindow::MessagesWindow
*****************************************************************************/
-MessagesWindow::MessagesWindow( intf_thread_t * p_intf,
+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 )
+ : BWindow( frame, name, B_FLOATING_WINDOW_LOOK, B_NORMAL_WINDOW_FEEL,
+ B_NOT_ZOOMABLE ),
+ p_intf(_p_intf)
{
- this->p_intf = p_intf;
-
SetSizeLimits( 400, 2000, 200, 2000 );
-
- BRect rect, textRect;
-
- rect = Bounds();
- rect.right -= B_V_SCROLL_BAR_WIDTH;
- textRect = rect;
- textRect.InsetBy( 5, 5 );
- fMessagesView = new MessagesView( p_intf,
- rect, "messages", textRect,
- B_FOLLOW_ALL, B_WILL_DRAW );
- fMessagesView->MakeEditable( false );
- fMessagesView->SetStylable( true );
- fScrollView = new BScrollView( "scrollview", fMessagesView, B_WILL_DRAW,
- B_FOLLOW_ALL, false, true );
- fMessagesView->fScrollBar = fScrollView->ScrollBar( B_VERTICAL );
- AddChild( fScrollView );
-
+
+ p_sub = msg_Subscribe( p_intf );
+
+ BRect rect, textRect;
+
+ rect = Bounds();
+ rect.right -= B_V_SCROLL_BAR_WIDTH;
+ textRect = rect;
+ textRect.InsetBy( 5, 5 );
+ fMessagesView = new MessagesView( p_sub,
+ rect, "messages", textRect,
+ B_FOLLOW_ALL, B_WILL_DRAW );
+ fMessagesView->MakeEditable( false );
+ fMessagesView->SetStylable( true );
+ fScrollView = new BScrollView( "scrollview", fMessagesView, B_WILL_DRAW,
+ B_FOLLOW_ALL, false, true );
+ fMessagesView->fScrollBar = fScrollView->ScrollBar( B_VERTICAL );
+ AddChild( fScrollView );
+
/* start window thread in hidden state */
Hide();
Show();
*****************************************************************************/
MessagesWindow::~MessagesWindow()
{
+ msg_Unsubscribe( p_intf, p_sub );
}
/*****************************************************************************