Commit e21af726 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files

VOUT_WINDOW_SET_ON_TOP -> VOUT_WINDOW_SET_STATE

parent b20b1a27
......@@ -49,7 +49,7 @@ enum {
* Control query for vout_window_t
*/
enum {
VOUT_WINDOW_SET_ON_TOP, /* int b_on_top */
VOUT_WINDOW_SET_STATE, /* unsigned state */
VOUT_WINDOW_SET_SIZE, /* unsigned i_width, unsigned i_height */
VOUT_WINDOW_SET_FULLSCREEN, /* int b_fullscreen */
};
......@@ -134,11 +134,11 @@ VLC_EXPORT( void, vout_window_Delete, (vout_window_t *) );
VLC_EXPORT( int, vout_window_Control, (vout_window_t *, int query, ...) );
/**
* Configure the "On Top" properties of a windows.
* Configure the window management state of a windows.
*/
static inline int vout_window_SetOnTop(vout_window_t *window, bool is_on_top)
static inline int vout_window_SetState(vout_window_t *window, unsigned state)
{
return vout_window_Control(window, VOUT_WINDOW_SET_ON_TOP, is_on_top);
return vout_window_Control(window, VOUT_WINDOW_SET_STATE, state);
}
/**
......
......@@ -892,7 +892,7 @@ int MainInterface::controlVideo( int i_query, va_list args )
emit askUpdate();
return VLC_EGENERIC;
}
case VOUT_WINDOW_SET_ON_TOP:
case VOUT_WINDOW_SET_STATE:
{
int i_arg = va_arg( args, int );
QApplication::postEvent( this, new SetVideoOnTopQtEvent( i_arg ) );
......
......@@ -147,7 +147,7 @@ static int Control (vout_window_t *wnd, int query, va_list ap)
switch (query)
{
case VOUT_WINDOW_SET_SIZE: /* not allowed */
case VOUT_WINDOW_SET_ON_TOP: /* not allowed either, would be ugly */
case VOUT_WINDOW_SET_STATE: /* not allowed either, would be ugly */
return VLC_EGENERIC;
default:
msg_Warn (wnd, "unsupported control query %d", query);
......
......@@ -613,7 +613,7 @@ int CommonControl(vout_display_t *vd, int query, va_list args)
return VLC_EGENERIC;
#endif
if (sys->parent_window) {
if (vout_window_SetOnTop(sys->parent_window, is_on_top))
if (vout_window_SetState(sys->parent_window, is_on_top))
return VLC_EGENERIC;
} else {
HMENU hMenu = GetSystemMenu(sys->hwnd, FALSE);
......
......@@ -564,7 +564,7 @@ static int vaControlParentWindow( vout_thread_t *p_vout, int i_query,
case VOUT_SET_STAY_ON_TOP:
{
const bool is_on_top = va_arg(args, int);
return vout_window_SetOnTop( p_vout->p_sys->parent_window, is_on_top );
return vout_window_SetState( p_vout->p_sys->parent_window, is_on_top );
}
default:
return VLC_EGENERIC;
......
......@@ -471,7 +471,7 @@ static int Control (vout_display_t *vd, int query, va_list ap)
case VOUT_DISPLAY_CHANGE_ON_TOP:
{
int b_on_top = (int)va_arg (ap, int);
return vout_window_SetOnTop (sys->embed, b_on_top);
return vout_window_SetState (sys->embed, b_on_top);
}
case VOUT_DISPLAY_CHANGE_DISPLAY_SIZE:
......
......@@ -478,7 +478,7 @@ static int Control (vout_window_t *wnd, int cmd, va_list ap)
break;
}
case VOUT_WINDOW_SET_ON_TOP:
case VOUT_WINDOW_SET_STATE:
set_wm_state (wnd, va_arg (ap, int), p_sys->wm_state_above);
break;
......
......@@ -469,7 +469,7 @@ static int Control (vout_display_t *vd, int query, va_list ap)
case VOUT_DISPLAY_CHANGE_ON_TOP:
{
int b_on_top = (int)va_arg (ap, int);
return vout_window_SetOnTop (p_sys->embed, b_on_top);
return vout_window_SetState (p_sys->embed, b_on_top);
}
case VOUT_DISPLAY_CHANGE_ZOOM:
......
......@@ -739,7 +739,7 @@ static int Control (vout_display_t *vd, int query, va_list ap)
case VOUT_DISPLAY_CHANGE_ON_TOP:
{
int on_top = (int)va_arg (ap, int);
return vout_window_SetOnTop (p_sys->embed, on_top);
return vout_window_SetState (p_sys->embed, on_top);
}
/* Hide the mouse. It will be send when
......
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