Mercurial > jmeCapture
changeset 72:dd97f65f940c
finish removing xuggler.
author | Robert McIntyre <rlm@mit.edu> |
---|---|
date | Mon, 10 Mar 2014 18:57:00 -0400 |
parents | 2c50a0c99715 |
children | 877ae4b2993c |
files | build.xml src/com/aurellem/capture/Capture.java |
diffstat | 2 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
1.1 --- a/build.xml Mon Mar 10 18:54:35 2014 -0400 1.2 +++ b/build.xml Mon Mar 10 18:57:00 2014 -0400 1.3 @@ -21,8 +21,8 @@ 1.4 <pathelement path="${lib}/logback-classic.jar"/> 1.5 <pathelement path="${lib}/logback-core.jar"/> 1.6 <pathelement path="${lib}/slf4j-api.jar"/> 1.7 + <pathelement path="${lib}/xuggle-xuggler.jar"/> 1.8 --> 1.9 - <pathelement path="${lib}/xuggle-xuggler.jar"/> 1.10 <pathelement path="${lib}/tritonus_aos-0.3.6.jar"/> 1.11 <pathelement path="${lib}/tritonus_share-0.3.6.jar"/> 1.12 </path>
2.1 --- a/src/com/aurellem/capture/Capture.java Mon Mar 10 18:54:35 2014 -0400 2.2 +++ b/src/com/aurellem/capture/Capture.java Mon Mar 10 18:57:00 2014 -0400 2.3 @@ -90,11 +90,11 @@ 2.4 2.5 if (file.getCanonicalPath().endsWith(".avi")){ 2.6 videoRecorder = new AVIVideoRecorder(file);} 2.7 - else if (file.isDirectory()){ 2.8 + else { 2.9 videoRecorder = new FileVideoRecorder(file);} 2.10 - else { 2.11 + //else { 2.12 //videoRecorder = new XuggleVideoRecorder(file); 2.13 - } 2.14 + //} 2.15 2.16 Callable<Object> thunk = new Callable<Object>(){ 2.17 public Object call(){