WS_POPUP|WS_CAPTION|WS_SYSMENU|WS_SIZEBOX,
0, 0, /*CW_USEDEFAULT*/300, /*CW_USEDEFAULT*/300,
p_parent->GetHandle(), NULL, h_inst, (void *)this );
+ // Suscribe to messages bank
+ cb_data = new msg_cb_data_t;
+ cb_data->self = this;
+ sub = msg_Subscribe( p_intf->p_libvlc, sinkMessage, cb_data );
+}
+
+Messages::~Messages()
+{
+ delete cb_data;
+ msg_Unsubscribe(sub);
}
/***********************************************************************
SHFullScreen( hwnd, SHFS_HIDESIPBUTTON );
break;
- case WM_TIMER:
- UpdateLog();
- break;
-
case WM_CLOSE:
Show( FALSE );
return TRUE;
return DefWindowProc( hwnd, msg, wp, lp );
}
-void Messages::UpdateLog()
+void Messages::sinkMessage (msg_cb_data_t *data, msg_item_t *item,
+ unsigned overruns)
{
- msg_subscription_t *p_sub = p_intf->p_sys->p_sub;
- string debug;
- int i_start, i_stop;
+ Messages *self = data->self;
- vlc_mutex_lock( p_sub->p_lock );
- 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 )
- {
- vlc_value_t val;
- var_Get( p_intf->p_libvlc, "verbose", &val );
+ self->sinkMessage (item, overruns);
+}
- switch( p_sub->p_msg[i_start].i_type )
- {
- case VLC_MSG_ERR:
- case VLC_MSG_INFO:
- if( val.i_int < 0 ) continue;
- break;
- case VLC_MSG_WARN:
- if( val.i_int < 1 ) continue;
- break;
- case VLC_MSG_DBG:
- if( val.i_int < 2 ) continue;
- break;
- }
+void Messages::sinkMessage (msg_item_t *item, unsigned overruns)
+{
+ vlc_value_t val;
+ var_Get( p_intf->p_libvlc, "verbose", &val );
- /* Append all messages to log window */
- debug = p_sub->p_msg[i_start].psz_module;
-
- switch( p_sub->p_msg[i_start].i_type )
- {
- case VLC_MSG_INFO: debug += ": "; break;
- case VLC_MSG_ERR: debug += " error: "; break;
- case VLC_MSG_WARN: debug += " warning: "; break;
- default: debug += " debug: "; break;
- }
- /* Add message */
- debug += p_sub->p_msg[i_start].psz_msg;
-
- LVITEM lv;
- lv.mask = LVIF_TEXT;
- lv.pszText = TEXT("");
- lv.cchTextMax = 1;
- lv.iSubItem = 0;
- lv.iItem = ListView_GetItemCount( hListView );
- ListView_InsertItem( hListView, &lv );
- ListView_SetItemText( hListView, lv.iItem, 0,
- (TCHAR *)_FROMMB(debug.c_str()) );
- }
+ /* Append all messages to log window */
+ string debug = item->psz_module;
- vlc_mutex_lock( p_sub->p_lock );
- p_sub->i_start = i_start;
- vlc_mutex_unlock( p_sub->p_lock );
+ switch( item->i_type )
+ {
+ case VLC_MSG_INFO: debug += ": "; break;
+ case VLC_MSG_ERR: debug += " error: "; break;
+ case VLC_MSG_WARN: debug += " warning: "; break;
+ default: debug += " debug: "; break;
}
+
+ /* Add message */
+ debug += item->psz_msg;
+
+ LVITEM lv;
+ lv.mask = LVIF_TEXT;
+ lv.pszText = TEXT("");
+ lv.cchTextMax = 1;
+ lv.iSubItem = 0;
+ lv.iItem = ListView_GetItemCount( hListView );
+ ListView_InsertItem( hListView, &lv );
+ ListView_SetItemText( hListView, lv.iItem, 0,
+ (TCHAR *)_FROMMB(debug.c_str()) );
}
+
#endif
#include "vlc_keys.h"
+#include <vlc_messages.h>
#include <stdio.h>
#include <string>
int i_slider_oldpos; /* previous position */
bool b_slider_free; /* slider status */
- /* The messages window */
- msg_subscription_t* p_sub; /* message bank subscription */
+
/* Playlist management */
int i_playing; /* playlist selected item */
BOOL CreateTreeView( HWND );
};
+struct msg_cb_data_t
+{
+ Messages *self;
+};
+
/* Messages */
class Messages : public CBaseWindow
{
public:
/* Constructor */
Messages( intf_thread_t *, CBaseWindow *, HINSTANCE );
- virtual ~Messages(){};
+ ~Messages();
- void UpdateLog(void);
+ static void sinkMessage (msg_cb_data_t *, msg_item_t *, unsigned);
+ void sinkMessage (msg_item_t *item, unsigned);
protected:
virtual LRESULT WndProc( HWND, UINT, WPARAM, LPARAM );
+ /* The messages window */
+ msg_subscription_t* sub; /* message bank subscription */
+ msg_cb_data_t *cb_data;
HWND hListView;
bool b_verbose;
};