mirror of
https://code.videolan.org/videolan/vlc
synced 2024-09-28 23:09:59 +02:00
splitter: remove write-only window position
This commit is contained in:
parent
dda6961e5d
commit
00dbd258f7
@ -44,16 +44,6 @@ typedef struct
|
|||||||
/* Video format of the output */
|
/* Video format of the output */
|
||||||
video_format_t fmt;
|
video_format_t fmt;
|
||||||
|
|
||||||
/* Window hints */
|
|
||||||
struct
|
|
||||||
{
|
|
||||||
/* Relative position.
|
|
||||||
* (0,0) is equal to the default position.
|
|
||||||
*/
|
|
||||||
int i_x;
|
|
||||||
int i_y;
|
|
||||||
} window;
|
|
||||||
|
|
||||||
/* Video output module
|
/* Video output module
|
||||||
* Use NULL for default
|
* Use NULL for default
|
||||||
*/
|
*/
|
||||||
|
@ -146,8 +146,6 @@ static int Open( vlc_object_t *p_this )
|
|||||||
{
|
{
|
||||||
video_splitter_output_t *p_cfg = &p_splitter->p_output[i];
|
video_splitter_output_t *p_cfg = &p_splitter->p_output[i];
|
||||||
video_format_Copy( &p_cfg->fmt, &p_splitter->fmt );
|
video_format_Copy( &p_cfg->fmt, &p_splitter->fmt );
|
||||||
p_cfg->window.i_x = 0;
|
|
||||||
p_cfg->window.i_y = 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* */
|
/* */
|
||||||
|
@ -240,9 +240,7 @@ typedef struct
|
|||||||
bool b_active;
|
bool b_active;
|
||||||
int i_output;
|
int i_output;
|
||||||
|
|
||||||
/* Output position and size */
|
/* Output size */
|
||||||
int i_x;
|
|
||||||
int i_y;
|
|
||||||
int i_width;
|
int i_width;
|
||||||
int i_height;
|
int i_height;
|
||||||
|
|
||||||
@ -678,9 +676,6 @@ static int Open( vlc_object_t *p_this )
|
|||||||
p_cfg->fmt.i_visible_height =
|
p_cfg->fmt.i_visible_height =
|
||||||
p_cfg->fmt.i_height = p_output->i_height;
|
p_cfg->fmt.i_height = p_output->i_height;
|
||||||
|
|
||||||
p_cfg->window.i_x = p_output->i_x;
|
|
||||||
p_cfg->window.i_y = p_output->i_y;
|
|
||||||
|
|
||||||
p_cfg->psz_module = NULL;
|
p_cfg->psz_module = NULL;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -908,9 +903,6 @@ static int Configuration( panoramix_output_t pp_output[ROW_MAX][COL_MAX],
|
|||||||
p_output->filter = cfg;
|
p_output->filter = cfg;
|
||||||
|
|
||||||
/* */
|
/* */
|
||||||
p_output->i_x = i_dst_x;
|
|
||||||
p_output->i_y = i_dst_y;
|
|
||||||
|
|
||||||
p_output->i_width = cfg.black.i_left + p_output->i_src_width + cfg.black.i_right;
|
p_output->i_width = cfg.black.i_left + p_output->i_src_width + cfg.black.i_right;
|
||||||
p_output->i_height = cfg.black.i_top + p_output->i_src_height + cfg.black.i_bottom;
|
p_output->i_height = cfg.black.i_top + p_output->i_src_height + cfg.black.i_bottom;
|
||||||
|
|
||||||
|
@ -338,8 +338,6 @@ static int Open( vlc_object_t *p_this )
|
|||||||
p_cfg->fmt.i_height = p_output->i_height;
|
p_cfg->fmt.i_height = p_output->i_height;
|
||||||
p_cfg->fmt.i_sar_num = p_splitter->fmt.i_sar_num;
|
p_cfg->fmt.i_sar_num = p_splitter->fmt.i_sar_num;
|
||||||
p_cfg->fmt.i_sar_den = p_splitter->fmt.i_sar_den;
|
p_cfg->fmt.i_sar_den = p_splitter->fmt.i_sar_den;
|
||||||
p_cfg->window.i_x = p_output->i_left;
|
|
||||||
p_cfg->window.i_y = p_output->i_top;
|
|
||||||
p_cfg->psz_module = NULL;
|
p_cfg->psz_module = NULL;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user