Changeset 161 for trunk/src/org/thestaticvoid/iriverter/DVDInfoReader.java

Timestamp:

04/14/07 15:52:46 (5 years ago)

Author:

jlee

Message:

Add code from David Grundberg's KuwaiiRiver?; preparation to combine DVD and SingleVideo? code; improvements to the shitty stuff (more modular conversion code)

File:

• trunk/src/org/thestaticvoid/iriverter/DVDInfoReader.java (modified) (2 diffs)

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

@@ -26 +26 @@
 public class DVDInfoReader extends Thread {
         private DVDProgressDialog progressDialog;
-        private String drive, mplayerPath;
+        private InputVideo inputVideo;
+        private String mplayerPath;
         private Map titleInfo;
         
-        public DVDInfoReader(DVDProgressDialog progressDialog, String drive, String mplayerPath) {
+        public DVDInfoReader(DVDProgressDialog progressDialog, InputVideo inputVideo, String mplayerPath) {
                 this.progressDialog = progressDialog;
-                this.drive = drive;
+                this.inputVideo = inputVideo;
                 this.mplayerPath = mplayerPath;
                 titleInfo = new LinkedHashMap();
@@ -39 +40 @@
         
         public void run() {
-                int numberOfTitles = new MPlayerInfo("dvd://", drive, mplayerPath).getNumberOfTitles();
+                int numberOfTitles = new MPlayerInfo(inputVideo, mplayerPath).getNumberOfTitles();
                 progressDialog.setMaximum(numberOfTitles);
                 
                 for (int i = 1; i <= numberOfTitles; i++) {
                         progressDialog.setCurrent(i);
-                        MPlayerInfo rawTitleInfo = new MPlayerInfo("dvd://" + i, drive, mplayerPath);
+                        MPlayerInfo rawTitleInfo = new MPlayerInfo(new InputVideo("dvd://" + i, inputVideo.getName()), mplayerPath);
                         
                         int length = rawTitleInfo.getLength();