Renamed Video.setPath() to Video.setGStreamerPath(), fixed logic in Capture.addResFromStructure()

codeanticode · codeanticode · commit 2336f7347207 · 2012-08-15T18:35:35.000Z
diff --git a/java/libraries/video/src/processing/video/Capture.java b/java/libraries/video/src/processing/video/Capture.java
@@ -561,7 +561,8 @@ static protected void addResFromStructure(ArrayList<String> res, Structure str,
     boolean singleFrac = false;
     try {
       Fraction fr = str.getFraction("framerate");
-      res.add(makeResolutionString(w, h, fr.numerator, fr.denominator));              
+      res.add(makeResolutionString(w, h, fr.numerator, fr.denominator));
+      singleFrac = true;
     } catch (Exception e) { 
     }
     
diff --git a/java/libraries/video/src/processing/video/Video.java b/java/libraries/video/src/processing/video/Video.java
@@ -66,7 +66,7 @@ public class Video implements PConstants {
   }  
     
   
-  static public void setPath(String path) {
+  static public void setGStreamerPath(String path) {
     gstreamerPath = path;
   }
   

Original file line number	Diff line number	Diff line change
`@@ -561,7 +561,8 @@ static protected void addResFromStructure(ArrayList<String> res, Structure str,`
`561`	`561`	`boolean singleFrac = false;`
`562`	`562`	`try {`
`563`	`563`	`Fraction fr = str.getFraction("framerate");`
`564`		`- res.add(makeResolutionString(w, h, fr.numerator, fr.denominator));`
	`564`	`+ res.add(makeResolutionString(w, h, fr.numerator, fr.denominator));`
	`565`	`+ singleFrac = true;`
`565`	`566`	`} catch (Exception e) {`
`566`	`567`	`}`
`567`	`568`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ public class Video implements PConstants {`
`66`	`66`	`}`
`67`	`67`
`68`	`68`
`69`		`- static public void setPath(String path) {`
	`69`	`+ static public void setGStreamerPath(String path) {`
`70`	`70`	`gstreamerPath = path;`
`71`	`71`	`}`
`72`	`72`