Ignore:
Timestamp:
Dec 27, 2011, 5:44:12 PM (14 years ago)
Author:
Silvan Scherrer
Message:

SMPlayer: latest svn update

Location:
smplayer/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • smplayer/trunk

  • smplayer/trunk/src/screensaver.cpp

    r112 r119  
    11/*  smplayer, GUI front-end for mplayer.
    2     Copyright (C) 2006-2010 Ricardo Villalba <rvm@escomposlinux.org>
     2    Copyright (C) 2006-2011 Ricardo Villalba <rvm@escomposlinux.org>
    33
    44    This program is free software; you can redistribute it and/or modify
     
    2828        lowpower = poweroff = screensaver = 0;
    2929#else
    30         SSaver = new QLibrary("SSCORE");
    31         SSaver->load();
    32         SSCore_TempDisable = SSCore_TempEnable = NULL;
    33         if (SSaver->isLoaded()) {
    34                 SSCore_TempDisable = (FuncPtr) SSaver->resolve("SSCore_TempDisable");
    35                 SSCore_TempEnable = (FuncPtr) SSaver->resolve("SSCore_TempEnable");
    36         }
     30        SSaver = new QLibrary("SSCORE");
     31        SSaver->load();
     32        SSCore_TempDisable = SSCore_TempEnable = NULL;
     33        if (SSaver->isLoaded()) {
     34                SSCore_TempDisable = (FuncPtr) SSaver->resolve("SSCore_TempDisable");
     35                SSCore_TempEnable = (FuncPtr) SSaver->resolve("SSCore_TempEnable");
     36        }
    3737#endif
    3838        state_saved = false;
     
    4545        restoreState();
    4646#ifdef Q_OS_OS2
    47         unload();
     47        unload();
    4848#endif
    4949}
     
    6464                qDebug("WinScreenSaver::retrieveState: lowpower: %d, poweroff: %d, screensaver: %d", lowpower, poweroff, screensaver);
    6565#else
    66                 state_saved = true;
    67                 qDebug("WinScreensaver::retrieveState: init done %s", SSCore_TempDisable ?"succesfully":"failed");
     66                state_saved = true;
     67                qDebug("WinScreensaver::retrieveState: init done %s", SSCore_TempDisable ?"succesfully":"failed");
    6868#endif
    6969        } else {
     
    8989                qDebug("WinScreenSaver::restoreState: lowpower: %d, poweroff: %d, screensaver: %d", lowpower, poweroff, screensaver);
    9090#else
    91                 if (SSCore_TempEnable) {
    92                 SSCore_TempEnable();
    93                 }
    94                 qDebug("WinScreenSaver::restoreState done");
     91                if (SSCore_TempEnable) {
     92                        SSCore_TempEnable();
     93                }
     94                qDebug("WinScreenSaver::restoreState done");
    9595#endif
    9696        } else {
     
    101101#ifdef Q_OS_OS2
    102102void WinScreenSaver::unload() {
    103    if (SSaver->isLoaded()) {
    104                 SSaver->unload();
    105                 delete SSaver;
    106         }
     103        if (SSaver->isLoaded()) {
     104                SSaver->unload();
     105                delete SSaver;
     106        }
    107107}
    108108#endif
     
    110110void WinScreenSaver::disable() {
    111111        qDebug("WinScreenSaver::disable");
     112
    112113#ifndef Q_OS_OS2
    113114        if (QSysInfo::WindowsVersion < QSysInfo::WV_VISTA) {
     
    118119        SystemParametersInfo(SPI_SETSCREENSAVETIMEOUT, 0, NULL, 0);
    119120#else
    120         if (SSCore_TempDisable) {
    121                 SSCore_TempDisable();
    122         }
     121        if (SSCore_TempDisable) {
     122                SSCore_TempDisable();
     123        }
    123124#endif
     125
    124126        modified = true;
    125127}
Note: See TracChangeset for help on using the changeset viewer.