← Back to branch summary

~ubuntu-branches/ubuntu/raring/smplayer/raring

« back to all changes in this revision

Viewing changes to src/prefgeneral.cpp

  • Committer: Package Import Robot
  • Author(s): Alessio Treglia
  • Date: 2013-02-12 03:00:21 UTC
  • mfrom: (20.1.2 experimental)
  • Revision ID: package-import@ubuntu.com-20130212030021-q5mg053fru2u6zl8
Tags: 0.8.3-1
http://bugs.debian.org/698300
* Team upload.
* New upstream release. (Closes: #698300)

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/prefgeneral.cpp
68
68
        channels_combo->addItem( "2", MediaSettings::ChStereo );
69
69
        channels_combo->addItem( "4", MediaSettings::ChSurround );
70
70
        channels_combo->addItem( "6", MediaSettings::ChFull51 );
 
71
        channels_combo->addItem( "7", MediaSettings::ChFull61 );
 
72
        channels_combo->addItem( "8", MediaSettings::ChFull71 );
71
73
 
72
74
        connect(vo_combo, SIGNAL(currentIndexChanged(int)),
73
75
            this, SLOT(vo_combo_changed(int)));
95
97
        channels_combo->setItemText(0, tr("2 (Stereo)") );
96
98
        channels_combo->setItemText(1, tr("4 (4.0 Surround)") );
97
99
        channels_combo->setItemText(2, tr("6 (5.1 Surround)") );
 
100
        channels_combo->setItemText(3, tr("7 (6.1 Surround)") );
 
101
        channels_combo->setItemText(4, tr("8 (7.1 Surround)") );
98
102
 
99
103
        int deinterlace_item = deinterlace_combo->currentIndex();
100
104
        deinterlace_combo->clear();
369
373
                        vo_combo->addItem( "gl2 (yuv)", "gl2:yuv=3");
370
374
                }
371
375
                else
 
376
                if (vo == "gl_tiled") {
 
377
                        vo_combo->addItem( vo, vo);
 
378
                        vo_combo->addItem( "gl_tiled (yuv)", "gl_tiled:yuv=3");
 
379
                }
 
380
                else
372
381
                if (vo == "null" || vo == "png" || vo == "jpeg" || vo == "gif89a" || 
373
382
            vo == "tga" || vo == "pnm" || vo == "md5sum" ) 
374
383
                {