Handle initial suspend mode like normal suspend.

This commit is contained in:
Johns 2012-03-02 00:05:03 +01:00
parent 6a28064dce
commit 0df8e8a5fc
3 changed files with 9 additions and 5 deletions

View File

@ -57,8 +57,8 @@ static char ConfigVdpauDecoder = 1; ///< use vdpau decoder, if possible
#define ConfigVdpauDecoder 0 ///< no vdpau decoder configured #define ConfigVdpauDecoder 0 ///< no vdpau decoder configured
#endif #endif
static char ConfigFullscreen; ///< fullscreen modus
static char ConfigStartSuspended; ///< flag to start in suspend mode static char ConfigStartSuspended; ///< flag to start in suspend mode
static char ConfigFullscreen; ///< fullscreen modus
static char ConfigStartX11Server; ///< flag start the x11 server static char ConfigStartX11Server; ///< flag start the x11 server
static pthread_mutex_t SuspendLockMutex; ///< suspend lock mutex static pthread_mutex_t SuspendLockMutex; ///< suspend lock mutex
@ -2328,7 +2328,7 @@ void SoftHdDeviceExit(void)
/** /**
** Prepare plugin. ** Prepare plugin.
*/ */
void Start(void) int Start(void)
{ {
if (ConfigStartX11Server) { if (ConfigStartX11Server) {
StartXServer(); StartXServer();
@ -2356,7 +2356,9 @@ void Start(void)
#ifdef USE_TS_AUDIO #ifdef USE_TS_AUDIO
PesInit(PesDemuxAudio); PesInit(PesDemuxAudio);
#endif #endif
// FIXME: some good message here. Info(_("[softhddev] ready%s\n"), ConfigStartSuspended ? " suspended" : "");
return !ConfigStartSuspended;
} }
/** /**

View File

@ -76,7 +76,7 @@ extern "C"
/// C plugin exit + cleanup /// C plugin exit + cleanup
extern void SoftHdDeviceExit(void); extern void SoftHdDeviceExit(void);
/// C plugin start code /// C plugin start code
extern void Start(void); extern int Start(void);
/// C plugin stop code /// C plugin stop code
extern void Stop(void); extern void Stop(void);
/// C plugin main thread hook /// C plugin main thread hook

View File

@ -1405,7 +1405,9 @@ bool cPluginSoftHdDevice::Start(void)
} }
} }
::Start(); if (!::Start()) {
SuspendMode = SUSPEND_NORMAL;
}
return true; return true;
} }