Changeset 163

Timestamp:

04/14/07 17:11:39 (2 years ago)

Author:

jlee

Message:

JoinVideos? made modular using ConcatenateShit? class. Now everything compiles successfully. There are still a lot of things left to do before useable again:

• Reimplement DVD in SingleVideo? (=> automatic Matroska/OGM support thanks to KuwaiiRiver?'s code)
  
• Add error detection in all Jobs
  
• Close ProgressDialog? when done with Jobs and show errors if any
  

Things I want to do before 18:

• Implement 2-passes option in SingleVideo? Job/MencoderCommand (should be incredibly easy)
  
• Add GUI profile management (Ticket #12)
  

Yes...I'm happy with the way things are going. 18 will almost be the way this program should have always been.

Files:

• trunk/src/org/thestaticvoid/iriverter/ConcatenateShit.java (added)
• trunk/src/org/thestaticvoid/iriverter/ConverterUI.java (modified) (1 diff)
• trunk/src/org/thestaticvoid/iriverter/JoinVideos.java (modified) (5 diffs)
• trunk/src/org/thestaticvoid/iriverter/MPlayerInfo.java (modified) (1 diff)
• trunk/src/org/thestaticvoid/iriverter/MencoderShit.java (modified) (2 diffs)

trunk/src/org/thestaticvoid/iriverter/ConverterUI.java

@@ -768 +768 @@
-        }
-        
-JoinVideos
+void
-                CTabItem tabItem = new CTabItem(tabFolder, SWT.NONE);
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-        

trunk/src/org/thestaticvoid/iriverter/JoinVideos.java

@@ -31 +31 @@
-import org.eclipse.swt.layout.*;
-
-inVideosInfo
+b
-        private CTabItem tabItem;
-        private java.util.List inputVideos;
@@ -37 +37 @@
-        private Button up, add, remove, down, outputVideoSelect;
-        private Text outputVideoInput;
-
-
-
+, mplayerPath
+
+, String mplayerPath
-                super(parent, style);
-                this.tabItem = tabItem;
+                this.mplayerPath = mplayerPath;
-                inputVideos = new java.util.ArrayList();
-                
@@ -241 +242 @@
-        }
-        
-synchronized 
+
-                Display.getDefault().syncExec(new Runnable() {
-                        public void run() {
@@ -251 +252 @@
-        }
-        
-synchronized 
+
-                syncOutputVideo = outputVideo;
-                
@@ -260 +261 @@
-                });
-        }
+        
+        public String getDescription() {
+                return "Joining videos into " + new File(getOutputVideo()).getName();
+        }
+        
+        public ShitToDo[] getShitToDo() {
+                java.util.List shitToDo = new java.util.ArrayList();
+                
+                File tempFile;          
+                try {
+                        tempFile = File.createTempFile("iriverter-", ".avi");
+                        tempFile.deleteOnExit();
+                } catch (IOException io) {
+                        Logger.logException(io);
+                        return new ShitToDo[]{};
+                }
+                
+                shitToDo.add(new ConcatenateShit("Concatenating videos to a temporary file...", getInputVideos(), tempFile.toString()));
+                shitToDo.add(new MencoderShit("Writing header...", new MencoderCommand(new String[]{mplayerPath + MPlayerInfo.MENCODER_BIN, "-forceidx", "-ovc", "copy", "-oac", "copy"}, new InputVideo(tempFile.toString()), getOutputVideo())));
+                
+                return (ShitToDo[]) shitToDo.toArray(new ShitToDo[]{});
+        }
-}

trunk/src/org/thestaticvoid/iriverter/MPlayerInfo.java

@@ -33 +33 @@
-        private Process proc;
-        private StringBuffer mplayerOutput;
-        private boolean commandFound = true;
-        
-        public MPlayerInfo(InputVideo inputVideo) throws MPlayerNotFoundException {

trunk/src/org/thestaticvoid/iriverter/MencoderShit.java

@@ -45 +45 @@
-                
-                progressDialogInfo.setSubdescription(description);
+                progressDialogInfo.setMiscellaneous1("");
+                progressDialogInfo.setMiscellaneous2("");
-                
-                try {
@@ -92 +94 @@
-                                // This should never happen
-                                e.printStackTrace();
+                                throw new FailedToDoSomeShit(description);
-                        }                       
-                }