| 1 | Unhide function parameters that were hidden by declarations. |
|---|
| 2 | |
|---|
| 3 | From: Erik Hovland <erik@hovland.org> |
|---|
| 4 | |
|---|
| 5 | |
|---|
| 6 | --- |
|---|
| 7 | |
|---|
| 8 | mythtv/programs/mythfrontend/playbackbox.cpp | 16 ++++++++-------- |
|---|
| 9 | 1 files changed, 8 insertions(+), 8 deletions(-) |
|---|
| 10 | |
|---|
| 11 | |
|---|
| 12 | diff --git a/mythtv/programs/mythfrontend/playbackbox.cpp b/mythtv/programs/mythfrontend/playbackbox.cpp |
|---|
| 13 | index 55e0700..2b590df 100644 |
|---|
| 14 | --- a/mythtv/programs/mythfrontend/playbackbox.cpp |
|---|
| 15 | +++ b/mythtv/programs/mythfrontend/playbackbox.cpp |
|---|
| 16 | @@ -2349,14 +2349,14 @@ MythDialogBox *PlaybackBox::createProgramPopupMenu(const QString &title, |
|---|
| 17 | return NULL; |
|---|
| 18 | |
|---|
| 19 | QString label = title; |
|---|
| 20 | + ProgramInfo *curpginfo = NULL; |
|---|
| 21 | if (pginfo) |
|---|
| 22 | { |
|---|
| 23 | popupString(pginfo, label); |
|---|
| 24 | } |
|---|
| 25 | - else |
|---|
| 26 | + else if ((curpginfo = CurrentItem())) |
|---|
| 27 | { |
|---|
| 28 | - ProgramInfo *pginfo = CurrentItem(); |
|---|
| 29 | - popupString(pginfo, label); |
|---|
| 30 | + popupString(curpginfo, label); |
|---|
| 31 | } |
|---|
| 32 | |
|---|
| 33 | return createPopupMenu(label); |
|---|
| 34 | @@ -3415,22 +3415,22 @@ void PlaybackBox::customEvent(QEvent *event) |
|---|
| 35 | m_ncLock.unlock(); |
|---|
| 36 | |
|---|
| 37 | // This should be an impossible keypress we're simulating |
|---|
| 38 | - QKeyEvent *event; |
|---|
| 39 | + QKeyEvent *keyevent; |
|---|
| 40 | Qt::KeyboardModifiers modifiers = |
|---|
| 41 | Qt::ShiftModifier | |
|---|
| 42 | Qt::ControlModifier | |
|---|
| 43 | Qt::AltModifier | |
|---|
| 44 | Qt::MetaModifier | |
|---|
| 45 | Qt::KeypadModifier; |
|---|
| 46 | - event = new QKeyEvent(QEvent::KeyPress, Qt::Key_LaunchMedia, |
|---|
| 47 | + keyevent = new QKeyEvent(QEvent::KeyPress, Qt::Key_LaunchMedia, |
|---|
| 48 | modifiers); |
|---|
| 49 | QApplication::postEvent((QObject*)(gContext->GetMainWindow()), |
|---|
| 50 | - event); |
|---|
| 51 | + keyevent); |
|---|
| 52 | |
|---|
| 53 | - event = new QKeyEvent(QEvent::KeyRelease, Qt::Key_LaunchMedia, |
|---|
| 54 | + keyevent = new QKeyEvent(QEvent::KeyRelease, Qt::Key_LaunchMedia, |
|---|
| 55 | modifiers); |
|---|
| 56 | QApplication::postEvent((QObject*)(gContext->GetMainWindow()), |
|---|
| 57 | - event); |
|---|
| 58 | + keyevent); |
|---|
| 59 | } |
|---|
| 60 | } |
|---|
| 61 | else if (message == "PREVIEW_READY") |
|---|
