Skip to content

Commit e50cfbf

Browse files
committed
AVInput COM-RPC Support: WIP
1 parent 8ede384 commit e50cfbf

File tree

2 files changed

+6
-7
lines changed

2 files changed

+6
-7
lines changed

AVInput/AVInput.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -167,10 +167,10 @@ namespace Plugin {
167167
try
168168
{
169169
int num = 0;
170-
if (iType == INPUT_TYPE_STRING_HDMI) {
170+
if (iType == INPUT_TYPE_INT_HDMI) {
171171
num = device::HdmiInput::getInstance().getNumberOfInputs();
172172
}
173-
else if (iType == INPUT_TYPE_STRING_COMPOSITE) {
173+
else if (iType == INPUT_TYPE_INT_COMPOSITE) {
174174
num = device::CompositeInput::getInstance().getNumberOfInputs();
175175
}
176176
if (num > 0) {
@@ -180,11 +180,11 @@ namespace Plugin {
180180
JsonObject hash;
181181
hash["id"] = i;
182182
std::stringstream locator;
183-
if (iType == INPUT_TYPE_STRING_HDMI) {
183+
if (iType == INPUT_TYPE_INT_HDMI) {
184184
locator << "hdmiin://localhost/deviceid/" << i;
185185
hash["connected"] = device::HdmiInput::getInstance().isPortConnected(i);
186186
}
187-
else if (iType == INPUT_TYPE_STRING_COMPOSITE) {
187+
else if (iType == INPUT_TYPE_INT_COMPOSITE) {
188188
locator << "cvbsin://localhost/deviceid/" << i;
189189
hash["connected"] = device::CompositeInput::getInstance().isPortConnected(i);
190190
}
@@ -216,8 +216,8 @@ namespace Plugin {
216216
response["devices"] = getInputDevices(iType);
217217
}
218218
else {
219-
JsonArray listHdmi = getInputDevices(INPUT_TYPE_STRING_HDMI);
220-
JsonArray listComposite = getInputDevices(INPUT_TYPE_STRING_COMPOSITE);
219+
JsonArray listHdmi = getInputDevices(INPUT_TYPE_INT_HDMI);
220+
JsonArray listComposite = getInputDevices(INPUT_TYPE_INT_COMPOSITE);
221221
for (int i = 0; i < listComposite.Length(); i++) {
222222
listHdmi.Add(listComposite.Get(i));
223223
}

AVInput/AVInputImplementation.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -668,7 +668,6 @@ namespace Plugin {
668668
}
669669
default: {
670670
LOGERR("getInputDevices: Invalid input type");
671-
successResult.success = false;
672671
return Core::ERROR_GENERAL;
673672
}
674673
}

0 commit comments

Comments
 (0)