Commit 91cefef2 authored by Jean-Paul Saman's avatar Jean-Paul Saman

mozilla: use the new text property

parent f51eb5cf
...@@ -115,6 +115,7 @@ Insert VideoLAN.VLCPlugin.2 ...@@ -115,6 +115,7 @@ Insert VideoLAN.VLCPlugin.2
width="640" width="640"
height="480" height="480"
toolbar="true" toolbar="true"
text="Waiting for video"
name="vlc"> name="vlc">
</EMBED> </EMBED>
</OBJECT> </OBJECT>
......
...@@ -273,6 +273,7 @@ VlcPlugin::~VlcPlugin() ...@@ -273,6 +273,7 @@ VlcPlugin::~VlcPlugin()
{ {
free(psz_baseURL); free(psz_baseURL);
free(psz_target); free(psz_target);
free(psz_text);
if( libvlc_log ) if( libvlc_log )
libvlc_log_close(libvlc_log, NULL); libvlc_log_close(libvlc_log, NULL);
if( libvlc_media_player ) if( libvlc_media_player )
......
...@@ -47,8 +47,6 @@ ...@@ -47,8 +47,6 @@
/* Enable/disable debugging printf's for X11 resizing */ /* Enable/disable debugging printf's for X11 resizing */
#undef X11_RESIZE_DEBUG #undef X11_RESIZE_DEBUG
#define WINDOW_TEXT "Waiting for video"
/***************************************************************************** /*****************************************************************************
* Unix-only declarations * Unix-only declarations
******************************************************************************/ ******************************************************************************/
...@@ -241,7 +239,7 @@ int16 NPP_HandleEvent( NPP instance, void * event ) ...@@ -241,7 +239,7 @@ int16 NPP_HandleEvent( NPP instance, void * event )
ForeColor(whiteColor); ForeColor(whiteColor);
MoveTo( (npwindow.width-80)/ 2 , npwindow.height / 2 ); MoveTo( (npwindow.width-80)/ 2 , npwindow.height / 2 );
if( p_plugin->psz_text ) if( p_plugin->psz_text )
DrawText( WINDOW_TEXT , 0 , strlen(WINDOW_TEXT) ); DrawText( p_plugin->psz_text, 0, strlen(p_plugin->psz_text) );
} }
} }
return true; return true;
...@@ -749,7 +747,7 @@ static LRESULT CALLBACK Manage( HWND p_hwnd, UINT i_msg, WPARAM wpar, LPARAM lpa ...@@ -749,7 +747,7 @@ static LRESULT CALLBACK Manage( HWND p_hwnd, UINT i_msg, WPARAM wpar, LPARAM lpa
SetTextColor(hdc, RGB(255, 255, 255)); SetTextColor(hdc, RGB(255, 255, 255));
SetBkColor(hdc, RGB(0, 0, 0)); SetBkColor(hdc, RGB(0, 0, 0));
if( p_plugin->psz_text ) if( p_plugin->psz_text )
DrawText( hdc, WINDOW_TEXT, strlen(WINDOW_TEXT), &rect, DrawText( hdc, p_plugin->psz_text, strlen(p_plugin->psz_text), &rect,
DT_CENTER|DT_VCENTER|DT_SINGLELINE); DT_CENTER|DT_VCENTER|DT_SINGLELINE);
EndPaint( p_hwnd, &paintstruct ); EndPaint( p_hwnd, &paintstruct );
...@@ -796,7 +794,7 @@ static void Redraw( Widget w, XtPointer closure, XEvent *event ) ...@@ -796,7 +794,7 @@ static void Redraw( Widget w, XtPointer closure, XEvent *event )
if( p_plugin->psz_text ) if( p_plugin->psz_text )
XDrawString( p_display, video, gc, XDrawString( p_display, video, gc,
window.width / 2 - 40, (window.height - i_control_height) / 2, window.width / 2 - 40, (window.height - i_control_height) / 2,
WINDOW_TEXT, strlen(WINDOW_TEXT) ); p_plugin->psz_text, strlen(p_plugin->psz_text) );
XFreeGC( p_display, gc ); XFreeGC( p_display, gc );
p_plugin->redrawToolbar(); p_plugin->redrawToolbar();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment