Attachment #292575 for bug #390233

Lines 161-166 Link Here

(-)src/tvtimeconf.h (+1 lines)
161	unsigned int config_get_channel_text_rgb( config_t *ct );	161	unsigned int config_get_channel_text_rgb( config_t *ct );
162	unsigned int config_get_other_text_rgb( config_t *ct );	162	unsigned int config_get_other_text_rgb( config_t *ct );
163	int config_get_fullscreen( config_t *ct );	163	int config_get_fullscreen( config_t *ct );
		164	int config_get_matte( config_t *ct );
164	int config_get_alwaysontop( config_t *ct );	165	int config_get_alwaysontop( config_t *ct );
165	int config_get_priority( config_t *ct );	166	int config_get_priority( config_t *ct );
166	uid_t config_get_uid( config_t *ct );	167	uid_t config_get_uid( config_t *ct );

Lines 141-147 Link Here

(-)src/tvtimeosd.c (-1 / +1 lines)
141	unsigned int other_b;	141	unsigned int other_b;
142	};	142	};
143	const int top_size = 7;	143	const int top_size = 15;
144	const int left_size = 7;	144	const int left_size = 7;
145	const int left_inner_size = 10;	145	const int left_inner_size = 10;
146	const int bottom_size = 13;	146	const int bottom_size = 13;

Lines 59-64 Link Here

(-)src/tvtimeconf.c (+14 lines)
59	int squarepixels;	59	int squarepixels;
60	int debug;	60	int debug;
61	int fullscreen;	61	int fullscreen;
		62	int matte;
62	int alwaysontop;	63	int alwaysontop;
63	int priority;	64	int priority;
64	int ntsc_mode;	65	int ntsc_mode;
Lines 323-328 Link Here
323	ct->fullscreen = atoi( curval );	324	ct->fullscreen = atoi( curval );
324	}	325	}
325		326
		327	if( !xmlStrcasecmp( name, BAD_CAST "Matte" ) ) {
		328	ct->matte = atoi( curval );
		329	}
		330
326	if( !xmlStrcasecmp( name, BAD_CAST "AlwaysOnTop" ) ) {	331	if( !xmlStrcasecmp( name, BAD_CAST "AlwaysOnTop" ) ) {
327	ct->alwaysontop = atoi( curval );	332	ct->alwaysontop = atoi( curval );
328	}	333	}
Lines 737-742 Link Here
737	ct->squarepixels = 1;	742	ct->squarepixels = 1;
738	ct->debug = 0;	743	ct->debug = 0;
739	ct->fullscreen = 0;	744	ct->fullscreen = 0;
		745	ct->matte = 0;
740	ct->alwaysontop = 0;	746	ct->alwaysontop = 0;
741	ct->priority = -10;	747	ct->priority = -10;
742	ct->ntsc_mode = 0;	748	ct->ntsc_mode = 0;
Lines 1015-1020 Link Here
1015	snprintf( tempstring, sizeof( tempstring ), "%d", ct->fullscreen );	1021	snprintf( tempstring, sizeof( tempstring ), "%d", ct->fullscreen );
1016	config_save( ct, "Fullscreen", tempstring );	1022	config_save( ct, "Fullscreen", tempstring );
1017		1023
		1024	snprintf( tempstring, sizeof( tempstring ), "%d", ct->matte );
		1025	config_save( ct, "Matte", tempstring );
		1026
1018	snprintf( tempstring, sizeof( tempstring ), "%d", ct->verbose );	1027	snprintf( tempstring, sizeof( tempstring ), "%d", ct->verbose );
1019	config_save( ct, "Verbose", tempstring );	1028	config_save( ct, "Verbose", tempstring );
1020		1029
Lines 1535-1540 Link Here
1535	return ct->fullscreen;	1544	return ct->fullscreen;
1536	}	1545	}
1537		1546
		1547	int config_get_matte( config_t *ct )
		1548	{
		1549	return ct->matte;
		1550	}
		1551
1538	int config_get_alwaysontop( config_t *ct )	1552	int config_get_alwaysontop( config_t *ct )
1539	{	1553	{
1540	return ct->alwaysontop;	1554	return ct->alwaysontop;




    build_fspos_menu( commands_get_menu( commands, "fspos" ),
                      config_get_fullscreen_position( ct ) );

    matte_mode = config_get_matte( ct );
    if( sixteennine == 0 ) { /* fix me for sixteennine mode */
        if( matte_mode == 1 ) {
            matte_y = 72;
            output->set_matte( 768, 432 );
        } else if( matte_mode == 2 ) {
            matte_y = 48;
            output->set_matte( 768, 480 );
        } else if( matte_mode == 3 ) {
            matte_y = 80;
            output->set_matte( 768, 416 );
        } else if( matte_mode == 4 ) {
            matte_y = 124;
            output->set_matte( 768, 328 );
        }
    }
    output->set_window_height( output->get_visible_height() );

    /* Initialize our timestamps. */
    for(;;) {
        const char *fifo_args = 0;

        }

        if( matte_mode ) {
            output_x = (int) ((((double) width) * commands_get_overscan( commands )) + 0.5) + matte_x;
            output_w = (int) ((((double) width) -
                               (((double) width) * commands_get_overscan( commands ) * 2.0)) + 0.5) - matte_x * 3;
            output_y = (int) ((((double) height) * commands_get_overscan( commands )) + 0.5) + matte_y;
            output_h = (int) ((((double) height) -
                               (((double) height) * commands_get_overscan( commands ) * 2.0)) + 0.5) - matte_y * 2;
        } else {
            output_x = (int) ((((double) width) *
                               commands_get_overscan( commands )) + 0.5);

        config_save( ct, "InputWidth", number );
    }

    snprintf( number, 4, "%d", matte_mode );
    config_save( ct, "Matte", number );

    snprintf( number, 4, "%d", commands_get_global_brightness( commands ) );
    config_save( ct, "DefaultBrightness", number );
    snprintf( number, 4, "%d", commands_get_global_contrast( commands ) );

Return to bug 390233

Lines 1581-1586 Link Here

(-)src/tvtime.c (-4 / +27 lines)
1581	build_fspos_menu( commands_get_menu( commands, "fspos" ),	1581	build_fspos_menu( commands_get_menu( commands, "fspos" ),
1582	config_get_fullscreen_position( ct ) );	1582	config_get_fullscreen_position( ct ) );
1583		1583
		1584	matte_mode = config_get_matte( ct );
		1585	if( sixteennine == 0 ) { /* fix me for sixteennine mode */
		1586	if( matte_mode == 1 ) {
		1587	matte_y = 72;
		1588	output->set_matte( 768, 432 );
		1589	} else if( matte_mode == 2 ) {
		1590	matte_y = 48;
		1591	output->set_matte( 768, 480 );
		1592	} else if( matte_mode == 3 ) {
		1593	matte_y = 80;
		1594	output->set_matte( 768, 416 );
		1595	} else if( matte_mode == 4 ) {
		1596	matte_y = 124;
		1597	output->set_matte( 768, 328 );
		1598	}
		1599	}
		1600	output->set_window_height( output->get_visible_height() );
		1601
1584	/* Initialize our timestamps. */	1602	/* Initialize our timestamps. */
1585	for(;;) {	1603	for(;;) {
1586	const char *fifo_args = 0;	1604	const char *fifo_args = 0;
Lines 1601-1610 Link Here
1601	}	1619	}
1602		1620
1603	if( matte_mode ) {	1621	if( matte_mode ) {
1604	output_x = matte_x;	1622	output_x = (int) ((((double) width) * commands_get_overscan( commands )) + 0.5) + matte_x;
1605	output_w = matte_w;	1623	output_w = (int) ((((double) width) -
1606	output_y = matte_y;	1624	(((double) width) * commands_get_overscan( commands ) * 2.0)) + 0.5) - matte_x * 3;
1607	output_h = matte_h;	1625	output_y = (int) ((((double) height) * commands_get_overscan( commands )) + 0.5) + matte_y;
		1626	output_h = (int) ((((double) height) -
		1627	(((double) height) * commands_get_overscan( commands ) * 2.0)) + 0.5) - matte_y * 2;
1608	} else {	1628	} else {
1609	output_x = (int) ((((double) width) *	1629	output_x = (int) ((((double) width) *
1610	commands_get_overscan( commands )) + 0.5);	1630	commands_get_overscan( commands )) + 0.5);
Lines 2509-2514 Link Here
2509	config_save( ct, "InputWidth", number );	2529	config_save( ct, "InputWidth", number );
2510	}	2530	}
2511		2531
		2532	snprintf( number, 4, "%d", matte_mode );
		2533	config_save( ct, "Matte", number );
		2534
2512	snprintf( number, 4, "%d", commands_get_global_brightness( commands ) );	2535	snprintf( number, 4, "%d", commands_get_global_brightness( commands ) );
2513	config_save( ct, "DefaultBrightness", number );	2536	config_save( ct, "DefaultBrightness", number );
2514	snprintf( number, 4, "%d", commands_get_global_contrast( commands ) );	2537	snprintf( number, 4, "%d", commands_get_global_contrast( commands ) );