1 | Rework any unused assignment. |
---|
2 | |
---|
3 | From: Erik Hovland <erik@hovland.org> |
---|
4 | |
---|
5 | |
---|
6 | --- |
---|
7 | |
---|
8 | mythtv/libs/libmythtv/NuppelVideoPlayer.cpp | 5 +---- |
---|
9 | mythtv/libs/libmythtv/tv_play.cpp | 3 +-- |
---|
10 | 2 files changed, 2 insertions(+), 6 deletions(-) |
---|
11 | |
---|
12 | |
---|
13 | diff --git a/mythtv/libs/libmythtv/NuppelVideoPlayer.cpp b/mythtv/libs/libmythtv/NuppelVideoPlayer.cpp |
---|
14 | index ab3b1b5..4dfbe87 100644 |
---|
15 | --- a/mythtv/libs/libmythtv/NuppelVideoPlayer.cpp |
---|
16 | +++ b/mythtv/libs/libmythtv/NuppelVideoPlayer.cpp |
---|
17 | @@ -719,10 +719,7 @@ bool NuppelVideoPlayer::InitVideo(void) |
---|
18 | { |
---|
19 | MythMainWindow *window = gContext->GetMainWindow(); |
---|
20 | |
---|
21 | - QWidget *widget = |
---|
22 | - window->findChild<QWidget*>("video playback window"); |
---|
23 | - |
---|
24 | - if (!widget) |
---|
25 | + if (!(widget = window->findChild<QWidget*>("video playback window"))) |
---|
26 | { |
---|
27 | VERBOSE(VB_IMPORTANT, "Couldn't find 'tv playback' widget"); |
---|
28 | widget = window->currentWidget(); |
---|
29 | diff --git a/mythtv/libs/libmythtv/tv_play.cpp b/mythtv/libs/libmythtv/tv_play.cpp |
---|
30 | index 11f2ba9..cfa06ef 100644 |
---|
31 | --- a/mythtv/libs/libmythtv/tv_play.cpp |
---|
32 | +++ b/mythtv/libs/libmythtv/tv_play.cpp |
---|
33 | @@ -7824,7 +7824,6 @@ void TV::DoEditSchedule(int editType) |
---|
34 | } |
---|
35 | |
---|
36 | // Actually show the pop-up UI |
---|
37 | - ProgramInfo *nextProgram = NULL; |
---|
38 | switch (editType) |
---|
39 | { |
---|
40 | case kScheduleProgramGuide: |
---|
41 | @@ -7855,7 +7854,7 @@ void TV::DoEditSchedule(int editType) |
---|
42 | } |
---|
43 | case kPlaybackBox: |
---|
44 | { |
---|
45 | - nextProgram = RunPlaybackBoxPtr((void *)this, !pause_active); |
---|
46 | + RunPlaybackBoxPtr((void *)this, !pause_active); |
---|
47 | ignoreKeyPresses = true; |
---|
48 | break; |
---|
49 | } |
---|