| 1 | *** trunk/mythtv/libs/libmythdb/mythsystem.cpp 2010-09-05 18:23:48.733188874 +0100 |
|---|
| 2 | --- a/mythtv/libs/libmythdb/mythsystem.cpp 2010-09-05 18:19:25.585189008 +0100 |
|---|
| 3 | *************** |
|---|
| 4 | *** 252,257 **** |
|---|
| 5 | --- 252,262 ---- |
|---|
| 6 | |
|---|
| 7 | myth_system_pre_flags( flags, ready_to_lock ); |
|---|
| 8 | |
|---|
| 9 | + #ifdef USE_LIRC |
|---|
| 10 | + bool lirc_lock_flag = !(flags & MYTH_SYSTEM_DONT_BLOCK_LIRC); |
|---|
| 11 | + LircEventLock lirc_lock(lirc_lock_flag && ready_to_lock); |
|---|
| 12 | + #endif |
|---|
| 13 | + |
|---|
| 14 | #ifndef USING_MINGW |
|---|
| 15 | pid_t pid; |
|---|
| 16 | |
|---|
| 17 | *************** |
|---|
| 18 | *** 303,313 **** |
|---|
| 19 | { |
|---|
| 20 | ready_to_lock = gCoreContext->HasGUI() && gCoreContext->IsUIThread(); |
|---|
| 21 | |
|---|
| 22 | - #ifdef USE_LIRC |
|---|
| 23 | - bool lirc_lock_flag = !(flags & MYTH_SYSTEM_DONT_BLOCK_LIRC); |
|---|
| 24 | - LircEventLock lirc_lock(lirc_lock_flag && ready_to_lock); |
|---|
| 25 | - #endif |
|---|
| 26 | - |
|---|
| 27 | #ifdef USE_JOYSTICK_MENU |
|---|
| 28 | bool joy_lock_flag = !(flags & MYTH_SYSTEM_DONT_BLOCK_JOYSTICK_MENU); |
|---|
| 29 | JoystickMenuEventLock joystick_lock(joy_lock_flag && ready_to_lock); |
|---|
| 30 | --- 308,313 ---- |
|---|
