Ignore:
Timestamp:
Mar 29, 2012, 3:09:42 PM (14 years ago)
Author:
Silvan Scherrer
Message:

SMPlayer: update to latest svn

File:
1 edited

Legend:

Unmodified
Added
Removed
  • smplayer/vendor/current/src/smplayer.h

    r121 r127  
    2727class SMPlayer : public QObject
    2828{
     29
     30
    2931public:
    3032        enum ExitCode { ErrorArgument = -3, NoAction = -2, NoRunningInstance = -1, NoError = 0, NoExit = 1 };
     
    4042        void start();
    4143
     44
     45
     46
     47
     48
    4249private:
     50
     51
    4352#ifndef PORTABLE_APP
    4453        void createConfigDirectory();
     
    4655        void showInfo();
    4756
    48         BaseGui * main_window;
     57        BaseGui * main_window;
    4958
    50     QStringList files_to_play;
    51     QString subtitle_file;
    52     QString actions_list; //!< Actions to be run on startup
     59QStringList files_to_play;
     60QString subtitle_file;
     61QString actions_list; //!< Actions to be run on startup
    5362        QString gui_to_use;
    5463
     
    6372        int close_at_end; // -1 = not set, 1 = true, 0 false
    6473        int start_in_fullscreen; // -1 = not set, 1 = true, 0 false
    65         bool use_control_server;
     74
     75#ifdef LOG_SMPLAYER
     76        // Output log
     77        static QFile output_log;
     78        static void myMessageOutput( QtMsgType type, const char *msg );
     79        static bool allow_to_send_log_to_gui;
     80#endif
    6681};
    6782
Note: See TracChangeset for help on using the changeset viewer.