blob: 637a8c7bc4c5bd5aa0243e3b38a13bb17f1998e2 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
|
--- src/mythtv/libs/libmyth/mythmediamonitor.cpp.orig 2016-04-06 21:44:16.206362097 +0000
+++ src/mythtv/libs/libmyth/mythmediamonitor.cpp 2016-04-06 21:47:14.753580798 +0000
@@ -664,33 +664,9 @@
return;
}
+ // TODO - Generate a dialog, add buttons for each description,
+ // if user didn't cancel, selected = handlers.at(choice);
int selected = 0;
- if (handlers.size() > 1)
- {
- QStringList buttonmsgs;
- for (QList<MHData>::const_iterator it = handlers.begin(); it != handlers.end(); ++it)
- buttonmsgs << ((!it->description.isEmpty()) ? it->description : it->destination);
- buttonmsgs << tr("Cancel");
-
- const DialogCode cancelbtn = DialogCode(
- int(kDialogCodeButton0) + buttonmsgs.size() - 1);
-
- DialogCode ret = MythPopupBox::ShowButtonPopup(GetMythMainWindow(),
- tr("Media Handler Selection"),
- tr("The new media contains mixed content "
- "that can be rendered in different ways. "
- "Select your preferred method."),
- buttonmsgs, cancelbtn);
- if (kDialogCodeRejected == ret || cancelbtn == ret)
- {
- LOG(VB_MEDIA, LOG_INFO, "User cancelled media handler selection");
- return;
- }
-
- selected = MythDialog::CalcItemIndex(ret);
- LOG(VB_MEDIA, LOG_NOTICE, QString("User selected '%1'")
- .arg(handlers.at(selected).destination) );
- }
handlers.at(selected).callback(pMedia);
}
|
