Ticket #7135: mdean.patch.mediamonitor-unix.cpp

File mdean.patch.mediamonitor-unix.cpp, 1.8 KB (added by Bill Meek <llibkeem@…>, 16 years ago)

From mdean, ​http://www.gossamer-threads.com/lists/mythtv/users/408825#408825

Line 
1Index: mediamonitor-unix.cpp
2===================================================================
3--- mediamonitor-unix.cpp (revision 22859)
4+++ mediamonitor-unix.cpp (working copy)
5@@ -219,35 +219,34 @@
6 ret.replace(QRegExp(".*/"), "/dev/");
7
8 #ifdef linux
9- QProcess *udevinfo = new QProcess();
10- QTextStream stream(udevinfo);
11+ QProcess udevinfo;
12+ QTextStream stream(&udevinfo);
13 QStringList args;
14
15 args << "-q";
16 args << "name";
17 args << "-rp";
18 args << sysfs;
19- udevinfo->start("udevinfo", args);
20+ udevinfo.start("udevinfo", args);
21
22- if (!udevinfo->waitForStarted(2000 /*ms*/))
23+ if (!udevinfo.waitForStarted(2000 /*ms*/))
24 {
25 VERBOSE(VB_MEDIA, msg + ", Error - udevinfo failed to start!");
26- udevinfo->deleteLater();
27 return ret;
28 }
29
30- if (!udevinfo->waitForFinished(2000 /*ms*/))
31+ if (!udevinfo.waitForFinished(2000 /*ms*/))
32 {
33 VERBOSE(VB_MEDIA,
34 msg + ", Error - udevinfo failed to end! Terminating");
35- udevinfo->kill();
36- udevinfo->deleteLater();
37+ udevinfo.kill();
38+ udevinfo.waitForFinished(2000 /*ms*/);
39 return ret;
40 }
41
42 if ((print_verbose_messages & (VB_MEDIA|VB_EXTRA)) == (VB_MEDIA|VB_EXTRA))
43 {
44- udevinfo->setReadChannel(QProcess::StandardError);
45+ udevinfo.setReadChannel(QProcess::StandardError);
46
47 while (!stream.atEnd())
48 {
49@@ -256,13 +255,12 @@
50 }
51 }
52
53- udevinfo->setReadChannel(QProcess::StandardOutput);
54+ udevinfo.setReadChannel(QProcess::StandardOutput);
55
56 ret = stream.readLine();
57 if (ret.startsWith("device not found in database"))
58 return ret;
59
60- udevinfo->deleteLater();
61 #endif // linux
62
63 VERBOSE(VB_MEDIA, msg + "->'" + ret + "'");
64