[chronojump] Improvements on last commit
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] Improvements on last commit
- Date: Wed, 12 Jun 2019 15:42:22 +0000 (UTC)
commit 60b7cf8ea1be4d438996fd484057b3d7ba4b7341
Author: Xavier de Blas <xaviblas gmail com>
Date: Wed Jun 12 17:41:26 2019 +0200
Improvements on last commit
src/webcamFfmpegSupportedModes.cs | 23 +++++++++++++++++------
1 file changed, 17 insertions(+), 6 deletions(-)
---
diff --git a/src/webcamFfmpegSupportedModes.cs b/src/webcamFfmpegSupportedModes.cs
index 2f479bcc..7dd42333 100644
--- a/src/webcamFfmpegSupportedModes.cs
+++ b/src/webcamFfmpegSupportedModes.cs
@@ -127,17 +127,20 @@ public class WebcamFfmpegSupportedModesMac : WebcamFfmpegSupportedModes
public override void GetModes()
{
+ bool testParsing = false; //change it to true to test the parsing method
+
+ if(testParsing)
+ {
+ modesStr = parseSupportedModes(parseSupportedModesTestString);
+ return;
+ }
+
//select and impossible mode just to get an error on mac, this error will give us the
"Supported modes"
Webcam webcamPlay = new WebcamFfmpeg (Webcam.Action.PLAYPREVIEW, UtilAll.GetOSEnum(),
cameraCode, "8000x8000", "8000");
Webcam.Result result = webcamPlay.PlayPreviewNoBackgroundWantStdoutAndStderr();
-
- string parsed = parseSupportedModes(result.output);
- //use this to test the parsing method
- //string parsed = parseSupportedModes(parseSupportedModesTestString);
-
- modesStr = result.output;
+ modesStr = parseSupportedModes(result.output);
}
protected override string parseSupportedModes(string allOutput)
@@ -154,6 +157,7 @@ public class WebcamFfmpegSupportedModesMac : WebcamFfmpegSupportedModes
);
bool started = false;
+ bool foundAtLeastOne = false;
foreach(string l in lines)
{
LogB.Information("line: " + l);
@@ -169,12 +173,19 @@ public class WebcamFfmpegSupportedModesMac : WebcamFfmpegSupportedModes
string parsedLine = parseSupportedMode(l);
if(parsedLine != "")
+ {
parsedAll += parsedLine + "\n";
+ foundAtLeastOne = true;
+ }
//after the list of video devices comes the list of audio devices, skip it
if(l.Contains("Input/output"))
break;
}
+
+ if(! foundAtLeastOne)
+ return "Not found any mode supported for your camera.";
+
return parsedAll;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]