tvtime_patched/tvtime-1.0.1-savematte.patch

   1 diff -urNp ./src/commands.c ../tvtime-1.0.1-savematte/src/commands.c
   2 --- ./src/commands.c    2005-09-08 03:31:48.000000000 +0100
   3 +++ ../tvtime-1.0.1-savematte/src/commands.c    2007-01-12 18:24:15.000000000 +0000
   4 @@ -128,6 +128,7 @@ struct commands_s {
   5      int togglepulldowndetection;
   6      int togglematte;
   7      int togglequiet;
   8 +    int changedoverscan;
   9      int framerate;
  10      int scan_channels;
  11      int pause;
  12 @@ -2897,7 +2898,7 @@ void commands_handle( commands_t *cmd, i
  13      case TVTIME_OVERSCAN_DOWN:
  14          cmd->overscan = cmd->overscan + ( (tvtime_cmd == TVTIME_OVERSCAN_UP) ? 0.0025 : -0.0025 );
  15          if( cmd->overscan > 0.4 ) cmd->overscan = 0.4; if( cmd->overscan < 0.0 ) cmd->overscan = 0.0;
  16 -
  17 +        cmd->changedoverscan = 1;
  18          if( cmd->osd ) {
  19              char message[ 200 ];
  20              snprintf( message, sizeof( message ), _("Overscan: %.1f%%"),
  21 @@ -3489,6 +3490,7 @@ void commands_next_frame( commands_t *cm
  22      cmd->togglepulldowndetection = 0;
  23      cmd->togglematte = 0;
  24      cmd->togglequiet = 0;
  25 +    cmd->changedoverscan = 0;
  26      cmd->resizewindow = 0;
  27      cmd->setdeinterlacer = 0;
  28      cmd->setfreqtable = 0;
  29 @@ -3536,6 +3538,11 @@ int commands_toggle_aspect( commands_t *
  30      return cmd->toggleaspect;
  31  }
  32
  33 +int commands_get_changed_overscan( commands_t *cmd )
  34 +{
  35 +    return cmd->changedoverscan;
  36 +}
  37 +
  38  int commands_toggle_alwaysontop( commands_t *cmd )
  39  {
  40      return cmd->togglealwaysontop;
  41 diff -urNp ./src/commands.h ../tvtime-1.0.1-savematte/src/commands.h
  42 --- ./src/commands.h    2004-10-28 01:50:24.000000000 +0100
  43 +++ ../tvtime-1.0.1-savematte/src/commands.h    2007-01-12 18:24:15.000000000 +0000
  44 @@ -64,6 +64,7 @@ void commands_set_pulldown_alg( commands
  45  int commands_quit( commands_t *cmd );
  46  int commands_toggle_fullscreen( commands_t *cmd );
  47  int commands_toggle_aspect( commands_t *cmd );
  48 +int commands_get_changed_overscan( commands_t *cmd );
  49  int commands_toggle_deinterlacer( commands_t *cmd );
  50  int commands_toggle_pulldown_detection( commands_t *cmd );
  51  int commands_toggle_matte( commands_t *cmd );
  52 diff -urNp ./src/tvtime.c ../tvtime-1.0.1-savematte/src/tvtime.c
  53 --- ./src/tvtime.c      2005-09-08 03:55:54.000000000 +0100
  54 +++ ../tvtime-1.0.1-savematte/src/tvtime.c      2007-01-12 18:29:25.000000000 +0000
  55 @@ -1062,84 +1062,55 @@ static void build_matte_menu( menu_t *me
  56      char string[ 128 ];
  57
  58      menu_set_back_command( menu, TVTIME_SHOW_MENU, "output" );
  59 -    if( sixteennine ) {
  60 -        snprintf( string, sizeof( string ), (mode == 0) ?
  61 -                  TVTIME_ICON_RADIOON "  %s" : TVTIME_ICON_RADIOOFF "  %s",
  62 -                  _("16:9 + Overscan") );
  63 -        menu_set_text( menu, 1, string );
  64 -        menu_set_enter_command( menu, 1, TVTIME_SET_MATTE, "16:9" );
  65 -        snprintf( string, sizeof( string ), (mode == 1) ?
  66 -                  TVTIME_ICON_RADIOON "  %s" : TVTIME_ICON_RADIOOFF "  %s",
  67 -                  _("1.85:1") );
  68 -        menu_set_text( menu, 2, string );
  69 -        menu_set_enter_command( menu, 2, TVTIME_SET_MATTE, "1.85:1" );
  70 -        snprintf( string, sizeof( string ), (mode == 2) ?
  71 -                  TVTIME_ICON_RADIOON "  %s" : TVTIME_ICON_RADIOOFF "  %s",
  72 -                  _("2.35:1") );
  73 -        menu_set_text( menu, 3, string );
  74 -        menu_set_enter_command( menu, 3, TVTIME_SET_MATTE, "2.35:1" );
  75 -        snprintf( string, sizeof( string ), (mode == 3) ?
  76 -                  TVTIME_ICON_RADIOON "  %s" : TVTIME_ICON_RADIOOFF "  %s",
  77 -                  _("4:3 centre") );
  78 -        menu_set_text( menu, 4, string );
  79 -        menu_set_enter_command( menu, 4, TVTIME_SET_MATTE, "4:3" );
  80 -        snprintf( string, sizeof( string ), (mode == 4) ?
  81 -                  TVTIME_ICON_RADIOON "  %s" : TVTIME_ICON_RADIOOFF "  %s",
  82 -                  _("16:10") );
  83 -        menu_set_text( menu, 5, string );
  84 -        menu_set_enter_command( menu, 5, TVTIME_SET_MATTE, "16:10" );
  85 -    } else {
  86 -        snprintf( string, sizeof( string ), (mode == 0) ?
  87 -                  TVTIME_ICON_RADIOON "  %s" : TVTIME_ICON_RADIOOFF "  %s",
  88 -                  _("4:3 + Overscan") );
  89 -        menu_set_text( menu, 1, string );
  90 -        menu_set_enter_command( menu, 1, TVTIME_SET_MATTE, "4:3" );
  91 -        snprintf( string, sizeof( string ), (mode == 1) ?
  92 -                  TVTIME_ICON_RADIOON "  %s" : TVTIME_ICON_RADIOOFF "  %s",
  93 -                  _("16:9") );
  94 -        menu_set_text( menu, 2, string );
  95 -        menu_set_enter_command( menu, 2, TVTIME_SET_MATTE, "16:9" );
  96 -        snprintf( string, sizeof( string ), (mode == 2) ?
  97 -                  TVTIME_ICON_RADIOON "  %s" : TVTIME_ICON_RADIOOFF "  %s",
  98 -                  _("16:10") );
  99 -        menu_set_text( menu, 3, string );
 100 -        menu_set_enter_command( menu, 3, TVTIME_SET_MATTE, "16:10" );
 101 -        snprintf( string, sizeof( string ), (mode == 3) ?
 102 -                  TVTIME_ICON_RADIOON "  %s" : TVTIME_ICON_RADIOOFF "  %s",
 103 -                  _("1.85:1") );
 104 -        menu_set_text( menu, 4, string );
 105 -        menu_set_enter_command( menu, 4, TVTIME_SET_MATTE, "1.85:1" );
 106 -        snprintf( string, sizeof( string ), (mode == 4) ?
 107 -                  TVTIME_ICON_RADIOON "  %s" : TVTIME_ICON_RADIOOFF "  %s",
 108 -                  _("2.35:1") );
 109 -        menu_set_text( menu, 5, string );
 110 -        menu_set_enter_command( menu, 5, TVTIME_SET_MATTE, "2.35:1" );
 111 -    }
 112 +
 113 +    snprintf( string, sizeof( string ), (mode == 0) ?
 114 +              TVTIME_ICON_RADIOON "  %s" : TVTIME_ICON_RADIOOFF "  %s",
 115 +              _("4:3") );
 116 +    menu_set_text( menu, 1, string );
 117 +    menu_set_enter_command( menu, 1, TVTIME_SET_MATTE, "4:3" );
 118 +    snprintf( string, sizeof( string ), (mode == 1) ?
 119 +              TVTIME_ICON_RADIOON "  %s" : TVTIME_ICON_RADIOOFF "  %s",
 120 +              _("16:10") );
 121 +    menu_set_text( menu, 2, string );
 122 +    menu_set_enter_command( menu, 2, TVTIME_SET_MATTE, "16:10" );
 123 +    snprintf( string, sizeof( string ), (mode == 2) ?
 124 +              TVTIME_ICON_RADIOON "  %s" : TVTIME_ICON_RADIOOFF "  %s",
 125 +              _("16:9") );
 126 +    menu_set_text( menu, 3, string );
 127 +    menu_set_enter_command( menu, 3, TVTIME_SET_MATTE, "16:9" );
 128 +    snprintf( string, sizeof( string ), (mode == 3) ?
 129 +              TVTIME_ICON_RADIOON "  %s" : TVTIME_ICON_RADIOOFF "  %s",
 130 +              _("1.85:1") );
 131 +    menu_set_text( menu, 4, string );
 132 +    menu_set_enter_command( menu, 4, TVTIME_SET_MATTE, "1.85:1" );
 133 +    snprintf( string, sizeof( string ), (mode == 4) ?
 134 +              TVTIME_ICON_RADIOON "  %s" : TVTIME_ICON_RADIOOFF "  %s",
 135 +              _("2.35:1") );
 136 +    menu_set_text( menu, 5, string );
 137 +    menu_set_enter_command( menu, 5, TVTIME_SET_MATTE, "2.35:1" );
 138 +
 139
 140      snprintf( string, sizeof( string ), TVTIME_ICON_PLAINLEFTARROW "  %s",
 141                _("Back") );
 142      menu_set_text( menu, 6, string );
 143      menu_set_enter_command( menu, 6, TVTIME_SHOW_MENU, "output" );
 144  }
 145 -
 146 +
 147  static void osd_list_matte( tvtime_osd_t *osd, int mode, int sixteennine )
 148  {
 149      tvtime_osd_list_set_lines( osd, 6 );
 150      if( sixteennine ) {
 151          tvtime_osd_list_set_text( osd, 0, _("Matte setting (Anamorphic input)") );
 152 -        tvtime_osd_list_set_text( osd, 1, _("16:9 + Overscan") );
 153 -        tvtime_osd_list_set_text( osd, 2, "1.85:1" );
 154 -        tvtime_osd_list_set_text( osd, 3, "2.35:1" );
 155 -        tvtime_osd_list_set_text( osd, 4, _("4:3 centre") );
 156 -        tvtime_osd_list_set_text( osd, 5, "16:10" );
 157 +
 158      } else {
 159          tvtime_osd_list_set_text( osd, 0, _("Matte setting (4:3 input)") );
 160 -        tvtime_osd_list_set_text( osd, 1, _("4:3 + Overscan") );
 161 -        tvtime_osd_list_set_text( osd, 2, "16:9" );
 162 -        tvtime_osd_list_set_text( osd, 3, "16:10" );
 163 -        tvtime_osd_list_set_text( osd, 4, "1.85:1" );
 164 -        tvtime_osd_list_set_text( osd, 5, "2.35:1" );
 165      }
 166 +    tvtime_osd_list_set_text( osd, 1, "4:3" );
 167 +    tvtime_osd_list_set_text( osd, 2, "16:10" );
 168 +    tvtime_osd_list_set_text( osd, 3, "16:9" );
 169 +    tvtime_osd_list_set_text( osd, 4, "1.85:1" );
 170 +    tvtime_osd_list_set_text( osd, 5, "2.35:1" );
 171 +
 172      tvtime_osd_list_set_hilight( osd, mode + 1 );
 173      tvtime_osd_show_list( osd, 1, 0 );
 174  }
 175 @@ -1204,6 +1175,7 @@ int tvtime_main( rtctimer_t *rtctimer, i
 176      int matte_y = 0;
 177      int matte_h = 0;
 178      int matte_mode = 0;
 179 +    int matte_changed = 0;
 180      int restarttvtime = 0;
 181      int return_value = 0;
 182      int last_current_id = -1;
 183 @@ -1241,6 +1213,7 @@ int tvtime_main( rtctimer_t *rtctimer, i
 184      output = get_xv_output();
 185
 186      sixteennine = config_get_aspect( ct );
 187 +    matte_mode = config_get_matte( ct );
 188
 189      if( !output || !output->init( config_get_geometry( ct ),
 190                                    sixteennine, config_get_square_pixels( ct ),
 191 @@ -1594,6 +1567,15 @@ int tvtime_main( rtctimer_t *rtctimer, i
 192      build_fspos_menu( commands_get_menu( commands, "fspos" ),
 193                        config_get_fullscreen_position( ct ) );
 194
 195 +    matte_changed = 1;
 196 +    double matte = 4.0/3.0;
 197 +
 198 +    /* initialize with safe values until matte is calculated later in the loop. */
 199 +    matte_x = 0;
 200 +    matte_y = 0;
 201 +    matte_w = width;
 202 +    matte_h = height;
 203 +
 204      /* Initialize our timestamps. */
 205      for(;;) {
 206          const char *fifo_args = 0;
 207 @@ -1607,31 +1589,19 @@ int tvtime_main( rtctimer_t *rtctimer, i
 208          int exposed = output->is_exposed();
 209          int current_id;
 210
 211 +
 212          if( vidin && videoinput_has_tuner( vidin ) ) {
 213              current_id = station_get_current_id( stationmgr );
 214          } else {
 215              current_id = 0;
 216          }
 217 -
 218 -        if( matte_mode ) {
 219 +            /* Since the matte/overscan calculations changed these could probably
 220 +               be the same variables, but we'll leave it like this for now. */
 221              output_x = matte_x;
 222              output_w = matte_w;
 223              output_y = matte_y;
 224              output_h = matte_h;
 225 -        } else {
 226 -            output_x = (int) ((((double) width) *
 227 -                               commands_get_overscan( commands )) + 0.5);
 228 -            output_w = (int) ((((double) width) -
 229 -                               (((double) width) *
 230 -                                commands_get_overscan( commands ) * 2.0)) +
 231 -                              0.5);
 232 -            output_y = (int) ((((double) height) *
 233 -                               commands_get_overscan( commands )) + 0.5);
 234 -            output_h = (int) ((((double) height) -
 235 -                               (((double) height) *
 236 -                                commands_get_overscan( commands ) * 2.0)) +
 237 -                              0.5);
 238 -        }
 239 +
 240
 241          if( fifo ) {
 242              int cmd;
 243 @@ -1766,11 +1736,14 @@ int tvtime_main( rtctimer_t *rtctimer, i
 244                                 quiet_screenshots );
 245              commands_refresh_menu( commands );
 246          }
 247 +
 248 +
 249          if( commands_toggle_aspect( commands ) ) {
 250 -            matte_mode = 0;
 251 -            output->set_matte( 0, 0 );
 252              if( output->toggle_aspect() ) {
 253                  sixteennine = 1;
 254 +                /* Matte is now always applied so we change it to 16:9 mode too so that
 255 +                   nothing other than overscan is cropped. */
 256 +                matte_mode = 2;
 257                  if( osd ) {
 258                      tvtime_osd_show_message( osd,
 259                            _("16:9 display mode active.") );
 260 @@ -1780,6 +1753,7 @@ int tvtime_main( rtctimer_t *rtctimer, i
 261                      ( ( (double) height ) * (16.0 / 9.0) );
 262              } else {
 263                  sixteennine = 0;
 264 +                matte_mode = 0;
 265                  if( osd ) {
 266                      tvtime_osd_show_message( osd,
 267                            _("4:3 display mode active.") );
 268 @@ -1800,9 +1774,7 @@ int tvtime_main( rtctimer_t *rtctimer, i
 269                                 output->is_alwaysontop_supported(),
 270                                 output->is_overscan_supported(),
 271                                 quiet_screenshots );
 272 -            build_matte_menu( commands_get_menu( commands, "matte" ),
 273 -                              matte_mode, sixteennine );
 274 -            commands_refresh_menu( commands );
 275 +            matte_changed = 1;
 276          }
 277          if( commands_get_fs_pos( commands ) ) {
 278              const char *fspos = commands_get_fs_pos( commands );
 279 @@ -1839,84 +1811,92 @@ int tvtime_main( rtctimer_t *rtctimer, i
 280              }
 281              commands_refresh_menu( commands );
 282          }
 283 +
 284 +        /* Overscan has been changed so it is calculated and applied with the matte.
 285 +           So changing it now generated this event so that we can tell it to redo the matte. */
 286 +       if( commands_get_changed_overscan( commands ) ) {
 287 +            matte_changed = 1;
 288 +        }
 289          if( commands_toggle_matte( commands ) ||
 290              commands_get_matte_mode( commands ) ) {
 291 -            double matte = 4.0 / 3.0;
 292 -            int sqwidth = sixteennine ?
 293 -                ((height * 16) / 9) : ((height * 4) / 3);
 294 -            int sqheight = sixteennine ?
 295 -                ((width * 9) / 16) : ((width * 3) / 4);
 296
 297 -            matte_x = 0;
 298 -            matte_w = width;
 299              if( commands_toggle_matte( commands ) ) {
 300                  matte_mode = (matte_mode + 1) % 5;
 301              } else {
 302 -                if( !strcmp( commands_get_matte_mode( commands ), "16:9" ) ) {
 303 -                    matte_mode = sixteennine ? 0 : 1;
 304 -                } else if( !strcmp( commands_get_matte_mode( commands ),
 305 -                                    "16:10" ) ) {
 306 -                    matte_mode = sixteennine ? 4 : 2;
 307 +                if( !strcmp( commands_get_matte_mode( commands ), "16:10" ) ) {
 308 +                    matte_mode = 1;
 309 +               } else if( !strcmp( commands_get_matte_mode( commands ),
 310 +                                    "16:9" ) ) {
 311 +                    matte_mode = 2;
 312                  } else if( !strcmp( commands_get_matte_mode( commands ),
 313                                      "1.85:1" ) ) {
 314 -                    matte_mode = sixteennine ? 1 : 3;
 315 +                    matte_mode = 3;
 316                  } else if( !strcmp( commands_get_matte_mode( commands ),
 317                                      "2.35:1" ) ) {
 318 -                    matte_mode = sixteennine ? 2 : 4;
 319 +                    matte_mode = 4;
 320                  } else {
 321 -                    matte_mode = sixteennine ? 3 : 0;
 322 +                    matte_mode = 0;
 323                  }
 324              }
 325 -
 326 -            if( sixteennine ) {
 327 -                if( matte_mode == 0 ) {
 328 -                    matte = 16.0 / 9.0;
 329 -                } else if( matte_mode == 1 ) {
 330 -                    matte = 1.85;
 331 -                } else if( matte_mode == 2 ) {
 332 -                    matte = 2.35;
 333 -                } else if( matte_mode == 3 ) {
 334 -                    matte = 4.0 / 3.0;
 335 -                    matte_w = (int) (((double) sqheight * matte) + 0.5);
 336 -                    matte_x = (width - matte_w) / 2;
 337 -                    /* We're cropping the sides off so we add overscan to avoid mess
 338 -                     * at the top of the screen. */
 339 -                    matte_y = commands_get_overscan( commands ) * height / 2;
 340 -                    matte_h = height - matte_y;
 341 -                    output->set_matte( (matte_h * 4) / 3, matte_h );
 342 -                } else if( matte_mode == 4 ) {
 343 -                    matte = 1.6;
 344 -                    matte_w = (int) (((double) sqheight * matte) + 0.5);
 345 -                    matte_x = (width - matte_w) / 2;
 346 -                    /* We're cropping the sides off so we add overscan to avoid mess
 347 -                     * at the top of the screen. */
 348 -                    matte_y = commands_get_overscan( commands ) * height / 2;
 349 -                    matte_h = height - matte_y;
 350 -                    output->set_matte( (matte_h * 16) / 10, matte_h );
 351 -                }
 352 -            } else {
 353 -                if( matte_mode == 1 ) {
 354 -                    matte = 16.0 / 9.0;
 355 -                } else if( matte_mode == 2 ) {
 356 -                    matte = 1.6;
 357 -                } else if( matte_mode == 3 ) {
 358 -                    matte = 1.85;
 359 -                } else if( matte_mode == 4 ) {
 360 -                    matte = 2.35;
 361 -                }
 362 -            }
 363 -            if( !matte_x ) {
 364 -                matte_h = (int) ((((double) sqwidth)/matte) + 0.5);
 365 -                matte_y = (height - matte_h) / 2;
 366 -                output->set_matte( sqwidth, matte_h );
 367 -            }
 368              if( osd && !commands_menu_active( commands ) ) {
 369                  osd_list_matte( osd, matte_mode, sixteennine );
 370              }
 371              build_matte_menu( commands_get_menu( commands, "matte" ),
 372                                matte_mode, sixteennine );
 373              commands_refresh_menu( commands );
 374 +            matte_changed = 1;
 375          }
 376 +        if (matte_changed) {
 377 +            matte_changed = 0;
 378 +
 379 +            /* start with overscan then apply matte */
 380 +            matte_x = (int) ((((double) width) *
 381 +                               commands_get_overscan( commands )) + 0.5);
 382 +            matte_w = (int) ((((double) width) -
 383 +                               (((double) width) *
 384 +                                commands_get_overscan( commands ) * 2.0)) +
 385 +                              0.5);
 386 +            matte_y = (int) ((((double) height) *
 387 +                               commands_get_overscan( commands )) + 0.5);
 388 +            matte_h = (int) ((((double) height) -
 389 +                               (((double) height) *
 390 +                                commands_get_overscan( commands ) * 2.0)) +
 391 +                              0.5);
 392 +
 393 +            int sqwidth = sixteennine ?
 394 +                ((matte_h * 16) / 9) : ((matte_h * 4) / 3);
 395 +            int sqheight = sixteennine ?
 396 +                ((matte_w * 9) / 16) : ((matte_w * 3) / 4);
 397 +
 398 +            if( matte_mode == 0 ) {
 399 +                matte = 4.0 / 3.0;
 400 +                config_save( ct, "Matte", "4:3" );
 401 +            } else if( matte_mode == 1 ) {
 402 +                matte = 1.6;
 403 +                config_save( ct, "Matte", "16:10" );
 404 +            } else if( matte_mode == 2 ) {
 405 +                matte = 16.0/9.0;
 406 +                config_save( ct, "Matte", "16:9" );
 407 +            } else if( matte_mode == 3 ) {
 408 +                matte = 1.85;
 409 +                config_save( ct, "Matte", "1.85:1" );
 410 +            } else if( matte_mode == 4 ) {
 411 +                matte = 2.35;
 412 +                config_save( ct, "Matte", "2.35:1" );
 413 +            }
 414 +
 415 +            if( sixteennine && matte < (16.0/9.0) )
 416 +            {
 417 +                matte_w = (int) (((double) sqheight * matte) + 0.5);
 418 +                matte_x = (width - matte_w) / 2;
 419 +                output->set_matte( matte_w, sqheight );
 420 +            } else {
 421 +                matte_h = (int) ((((double) sqwidth)/matte) + 0.5);
 422 +                matte_y = (height - matte_h) / 2;
 423 +                output->set_matte( sqwidth, matte_h );
 424 +            }
 425 +        }
 426 +
 427          if( commands_toggle_pulldown_detection( commands ) ) {
 428              if( height == 480 ) {
 429                  tvtime->pulldown_alg =
 430 diff -urNp ./src/tvtimeconf.c ../tvtime-1.0.1-savematte/src/tvtimeconf.c
 431 --- ./src/tvtimeconf.c  2005-09-08 05:07:56.000000000 +0100
 432 +++ ../tvtime-1.0.1-savematte/src/tvtimeconf.c  2007-01-12 18:26:09.000000000 +0000
 433 @@ -56,6 +56,7 @@ struct config_s
 434      char *geometry;
 435      int verbose;
 436      int aspect;
 437 +    int matte;
 438      int squarepixels;
 439      int debug;
 440      int fullscreen;
 441 @@ -290,6 +291,22 @@ static void parse_option( config_t *ct,
 442              ct->aspect = atoi( curval );
 443          }
 444
 445 +        if( !xmlStrcasecmp( name, BAD_CAST "Matte" ) ) {
 446 +            if(!strcmp( curval, "4:3")) {
 447 +                ct->matte = 0;
 448 +            } else if(!strcmp( curval, "16:10")) {
 449 +                ct->matte = 1;
 450 +            } else if(!strcmp( curval, "16:9")) {
 451 +                ct->matte = 2;
 452 +            } else if(!strcmp( curval, "1.85:1")) {
 453 +                ct->matte = 3;
 454 +            } else if(!strcmp( curval, "2.35:1")) {
 455 +                ct->matte = 4;
 456 +            }
 457 +            /* No valid matte if found ct->matte will be -1 and config_get_matte will choose
 458 +               a default based on the aspect ratio. */
 459 +        }
 460 +
 461          if( !xmlStrcasecmp( name, BAD_CAST "DebugMode" ) ) {
 462              ct->debug = atoi( curval );
 463          }
 464 @@ -712,6 +729,7 @@ config_t *config_new( void )
 465      ct->geometry = strdup( "0x576" );
 466      ct->verbose = 0;
 467      ct->aspect = 0;
 468 +    ct->matte = -1;
 469      ct->squarepixels = 1;
 470      ct->debug = 0;
 471      ct->fullscreen = 0;
 472 @@ -807,6 +825,10 @@ config_t *config_new( void )
 473      ct->keymap[ 'a' ] = TVTIME_TOGGLE_ASPECT;
 474      ct->keymap[ 'f' ] = TVTIME_TOGGLE_FULLSCREEN;
 475      ct->keymap[ 'i' ] = TVTIME_TOGGLE_INPUT;
 476 +    ct->keymap[ 'a' ] = TVTIME_TOGGLE_ASPECT;
 477 +    ct->keymap[ I_INSERT ] = TVTIME_TOGGLE_MATTE;
 478 +    ct->keymap[ ',' ] = TVTIME_OVERSCAN_DOWN;
 479 +    ct->keymap[ '.' ] = TVTIME_OVERSCAN_DOWN;
 480      ct->keymap[ 's' ] = TVTIME_SCREENSHOT;
 481      ct->keymap[ ',' ] = TVTIME_MIXER_TOGGLE_MUTE;
 482      ct->keymap[ 'e' ] = TVTIME_TOGGLE_AUDIO_MODE;
 483 @@ -1451,6 +1473,13 @@ int config_get_aspect( config_t *ct )
 484      return ct->aspect;
 485  }
 486
 487 +int config_get_matte( config_t *ct )
 488 +{
 489 +    /* If matte is not set then default to 0 for normal or 2 for widescreen. */
 490 +    if (ct->matte == -1) return ct->aspect * 2;
 491 +    return ct->matte;
 492 +}
 493 +
 494  int config_get_start_channel( config_t *ct )
 495  {
 496      return ct->start_channel;
 497 diff -urNp ./src/tvtimeconf.h ../tvtime-1.0.1-savematte/src/tvtimeconf.h
 498 --- ./src/tvtimeconf.h  2005-08-14 18:00:11.000000000 +0100
 499 +++ ../tvtime-1.0.1-savematte/src/tvtimeconf.h  2007-01-12 18:24:15.000000000 +0000
 500 @@ -151,6 +151,7 @@ int config_get_debug( config_t *ct );
 501  const char *config_get_geometry( config_t *ct );
 502  int config_get_inputwidth( config_t *ct );
 503  int config_get_aspect( config_t *ct );
 504 +int config_get_matte( config_t *ct );
 505  int config_get_inputnum( config_t *ct );
 506  const char *config_get_v4l_device( config_t *ct );
 507  const char *config_get_v4l_norm( config_t *ct );
 508 diff -urNp ./src/videoinput.c ../tvtime-1.0.1-savematte/src/videoinput.c
 509 --- ./src/videoinput.c  2005-09-08 04:13:37.000000000 +0100
 510 +++ ../tvtime-1.0.1-savematte/src/videoinput.c  2007-01-12 18:24:15.000000000 +0000
 511 @@ -376,6 +376,7 @@ uint8_t *videoinput_next_frame( videoinp
 512
 513          wait_for_frame_v4l2( vidin );
 514
 515 +        videoinput_get_aspect( vidin );
 516          cur_buf.type = vidin->capbuffers[ 0 ].vidbuf.type;
 517          if( ioctl( vidin->grab_fd, VIDIOC_DQBUF, &cur_buf ) < 0 ) {
 518              /* some drivers return EIO when there is no signal */
 519 @@ -1148,6 +1149,22 @@ void videoinput_set_saturation_relative(
 520      }
 521  }
 522
 523 +float videoinput_get_aspect( videoinput_t *vidin )
 524 +{
 525 +    float aspect = 1.0;
 526 +
 527 +    if( vidin->isv4l2 ) {
 528 +        struct v4l2_cropcap cropcap;
 529 +        /* on success 0 is returned */
 530 +        if( !ioctl( vidin->grab_fd, VIDIOC_CROPCAP, &cropcap ) ) {
 531 +            aspect = (float)cropcap.pixelaspect.numerator / (float)cropcap.pixelaspect.denominator;
 532 +            fprintf( stderr, "videoinput: Aspect ratio: %f\n", aspect);
 533 +        }
 534 +    }
 535 +
 536 +    return aspect;
 537 +}
 538 +
 539  static void videoinput_do_mute( videoinput_t *vidin, int mute )
 540  {
 541      if( vidin->hasaudio && mute != vidin->hw_muted ) {
 542 diff -urNp ./src/videoinput.h ../tvtime-1.0.1-savematte/src/videoinput.h
 543 --- ./src/videoinput.h  2005-09-08 03:55:10.000000000 +0100
 544 +++ ../tvtime-1.0.1-savematte/src/videoinput.h  2007-01-12 18:24:15.000000000 +0000
 545 @@ -71,6 +71,8 @@ typedef struct videoinput_s videoinput_t
 546  #define VIDEOINPUT_LANG1   4
 547  #define VIDEOINPUT_LANG2   8
 548
 549 +float videoinput_get_aspect( videoinput_t *vidin );
 550 +
 551  /**
 552   * Possible PAL audio modes, for the cx88 driver that cannot autodetect.
 553   */
 554 diff -urNp ./src/xvoutput.c ../tvtime-1.0.1-savematte/src/xvoutput.c
 555 --- ./src/xvoutput.c    2005-08-14 18:35:50.000000000 +0100
 556 +++ ../tvtime-1.0.1-savematte/src/xvoutput.c    2007-01-12 18:24:15.000000000 +0000
 557 @@ -233,7 +233,7 @@ static int xv_alloc_frame( void )
 558  {
 559      int size;
 560      uint8_t *alloc;
 561 -
 562 +
 563      size = input_width * input_height * 2;
 564      if( use_shm ) {
 565          alloc = create_shm( size );
 566
 567