Ignore:
Timestamp:
Aug 31, 2016, 5:31:04 PM (9 years ago)
Author:
Silvan Scherrer
Message:

smplayer: update trunk to version 16.8.0

Location:
smplayer/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • smplayer/trunk

  • smplayer/trunk/src/prefperformance.cpp

    r176 r181  
    4545        #endif
    4646
    47         // Priority is only for windows, so we disable for other systems
    4847#ifndef Q_OS_WIN
    4948        priority_group->hide();
     
    5958#endif
    6059
     60#ifndef TV_SUPPORT
     61        cachetv_label->hide();
     62        cache_tv_spin->hide();
     63        cachetv_label2->hide();
     64#endif
     65
    6166        retranslateStrings();
    6267}
     
    7176
    7277QPixmap PrefPerformance::sectionIcon() {
    73     return Images::icon("pref_performance", 22);
     78        return Images::icon("pref_performance");
    7479}
    7580
     
    9398
    9499void PrefPerformance::setData(Preferences * pref) {
     100        cache_auto_check->setChecked(pref->cache_auto);
    95101        setCacheForFiles( pref->cache_for_files );
    96102        setCacheForStreams( pref->cache_for_streams );
     
    98104        setCacheForAudioCDs( pref->cache_for_audiocds );
    99105        setCacheForVCDs( pref->cache_for_vcds );
     106#ifdef TV_SUPPORT
    100107        setCacheForTV( pref->cache_for_tv );
    101 
     108#endif
     109
     110#ifdef Q_OS_WIN
    102111        setPriority( pref->priority );
     112#endif
    103113        setFrameDrop( pref->frame_drop );
    104114        setHardFrameDrop( pref->hard_frame_drop );
     
    118128        requires_restart = false;
    119129
     130        TEST_AND_SET(pref->cache_auto, cache_auto_check->isChecked());
    120131        TEST_AND_SET(pref->cache_for_files, cacheForFiles());
    121132        TEST_AND_SET(pref->cache_for_streams, cacheForStreams());
     
    123134        TEST_AND_SET(pref->cache_for_audiocds, cacheForAudioCDs());
    124135        TEST_AND_SET(pref->cache_for_vcds, cacheForVCDs());
     136#ifdef TV_SUPPORT
    125137        TEST_AND_SET(pref->cache_for_tv, cacheForTV());
    126 
     138#endif
     139
     140#ifdef Q_OS_WIN
    127141        TEST_AND_SET(pref->priority, priority());
     142#endif
    128143        TEST_AND_SET(pref->frame_drop, frameDrop());
    129144        TEST_AND_SET(pref->hard_frame_drop, hardFrameDrop());
     
    180195}
    181196
     197#ifdef TV_SUPPORT
    182198void PrefPerformance::setCacheForTV(int n) {
    183199        cache_tv_spin->setValue(n);
     
    187203        return cache_tv_spin->value();
    188204}
    189 
     205#endif
     206
     207#ifdef Q_OS_WIN
    190208void PrefPerformance::setPriority(int n) {
    191209        priority_combo->setCurrentIndex(n);
     
    195213        return priority_combo->currentIndex();
    196214}
     215#endif
    197216
    198217void PrefPerformance::setFrameDrop(bool b) {
     
    352371        addSectionTitle(tr("Cache"));
    353372
    354         setWhatsThis(cache_files_spin, tr("Cache for files"),
     373        setWhatsThis(cache_auto_check, tr("Auto"),
     374                tr("Usually this option will enable the cache when it's necessary."));
     375
     376        setWhatsThis(cache_files_spin, tr("Cache for files"),
    355377                tr("This option specifies how much memory (in kBytes) to use when "
    356378           "precaching a file.") );
Note: See TracChangeset for help on using the changeset viewer.