Changeset 102

Timestamp:

04/18/06 12:27:19 (3 years ago)

Author:

jlee

Message:

Added ability to save logs, made ConverterOptions? static, improved logging

Files:

• trunk/src/Makefile.am (modified) (3 diffs)
• trunk/src/org/thestaticvoid/iriverter/Converter.java (modified) (10 diffs)
• trunk/src/org/thestaticvoid/iriverter/ConverterOptions.java (modified) (14 diffs)
• trunk/src/org/thestaticvoid/iriverter/ConverterUI.java (modified) (20 diffs)
• trunk/src/org/thestaticvoid/iriverter/DVD.java (modified) (4 diffs)
• trunk/src/org/thestaticvoid/iriverter/Directory.java (modified) (5 diffs)
• trunk/src/org/thestaticvoid/iriverter/JoinVideos.java (modified) (2 diffs)
• trunk/src/org/thestaticvoid/iriverter/LogViewer.java (modified) (4 diffs)
• trunk/src/org/thestaticvoid/iriverter/Logger.java (modified) (4 diffs)
• trunk/src/org/thestaticvoid/iriverter/MPlayerInfo.java (modified) (2 diffs)
• trunk/src/org/thestaticvoid/iriverter/ManualSplit.java (modified) (2 diffs)
• trunk/src/org/thestaticvoid/iriverter/SingleVideo.java (modified) (4 diffs)
• trunk/src/org/thestaticvoid/iriverter/icons/save-24.png (added)

trunk/src/Makefile.am

@@ -15 +15 @@
-iriverter_source_files = \
-        org/thestaticvoid/iriverter/Logger.java \
+        org/thestaticvoid/iriverter/LogViewer.java \
-        org/thestaticvoid/iriverter/DVD.java \
-        org/thestaticvoid/iriverter/SingleVideoAdapter.java \
@@ -71 +72 @@
-        org/thestaticvoid/iriverter/icons/home-24.png \
-        org/thestaticvoid/iriverter/icons/forward-24.png \
-
+
+
-
-iriverter_resources = \
@@ -116 +118 @@
-        $(iriverter_source_files) \
-        $(iriverter_icons) \
+        $(iriverter_resources) \
-        iriverter.desktop \
-        iriverter.ico \

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

@@ -7 +7 @@
-        private List jobs, notSplitVideos;
-        private ProgressDialogInfo progressDialogInfo;
-        private ConverterOptions converterOptions;
-        private Process proc;
-        private boolean isCanceled;
-        private int exitCode;
-        
-, ConverterOptions converterOptions
-, converterOptions), converterOptions
+
+)
-                this.progressDialogInfo = progressDialogInfo;
-                this.converterOptions = converterOptions;
-                isCanceled = false;
-                
@@ -23 +21 @@
-        }
-        
-, ConverterOptions converterOptions
+
-                List newJobs = new ArrayList();
-                
@@ -34 +32 @@
-                                        continue;
-                                
-c
-c
+C
+C
-                                
-                                if (!new File(outputVideoInfo.getOutputVideo()).getParentFile().exists())
@@ -73 +71 @@
-        }
-        
-, ConverterOptions converterOptions
+
-                List newJobs = new ArrayList();
-                
-                for (int i = 0; i < jobs.size(); i++)   
-                        if (jobs.get(i) instanceof DirectoryInfo)
-, converterOptions
+
-                        else if (jobs.get(i) instanceof DVDInfo)
-                                newJobs.addAll(separateDVDChaptersToSingleDVDJobs((DVDInfo) jobs.get(i)));
@@ -89 +87 @@
-        }
-        
-, ConverterOptions converterOptions
+
-                List newJobs = new ArrayList();
-                
@@ -96 +94 @@
-                for (int i = 0; i < directory.length; i++)
-                        if (new File(directoryInfo.getInputDirectory() + File.separator + directory[i]).isDirectory() && directoryInfo.getConvertSubdirectories())
-, converterOptions
+
-                        else if (new File(directoryInfo.getInputDirectory() + File.separator + directory[i]).isFile())
-c
+C
-                        
-                return newJobs;
@@ -183 +181 @@
-                commandList.add(outputVideo);
-                
-c
+C
-                        commandList.add("-of");
-                        commandList.add("lavf");
@@ -191 +189 @@
-                
-                commandList.add("-ovc");
-c
+C
-                        commandList.add("x264");
-                        commandList.add("-x264encopts");
-c
+C
-                } else {
-                        commandList.add("xvid");
-                        commandList.add("-xvidencopts");
-c
+C
-                }
-                
-                commandList.add("-oac");
-c
+C
-                        commandList.add("faac");
-                        commandList.add("-faacopts");
-c
+C
-                } else {
-                        commandList.add("mp3lame");
-                        commandList.add("-lameopts");
-c
-
-
-converterOptions.getCurrentProfile().getMaxFrameRate() ? c
+C
+
+
+ConverterOptions.getCurrentProfile().getMaxFrameRate() ? C
-                commandList.add("-vf");
-                commandList.add("filmdint=io=" + ((int) Math.round(info.getFrameRate() * 1000)) + ":" + ((int) Math.round(ofps * 1000)));
-                
-c
-c
-
-c
-c
-c
+C
+C
+
+C
+C
+C
-                }
-                
-                commandList.add("-vf-add");
-c
-converterOptions.getDimensions().getHeight()) / (double) info.getDimensions().getHeight()))) + ":" + converterOptions.getDimensions().getHeight() + ",crop=" + converterOptions.getDimensions().getWidth() + ":" + c
+C
+ConverterOptions.getDimensions().getHeight()) / (double) info.getDimensions().getHeight()))) + ":" + ConverterOptions.getDimensions().getHeight() + ",crop=" + ConverterOptions.getDimensions().getWidth() + ":" + C
-                else
-converterOptions.getDimensions().getWidth() + ":" + c
+ConverterOptions.getDimensions().getWidth() + ":" + C
-                
-                commandList.add("-vf-add");
-                commandList.add("harddup");
-                
-c
+C
-                        commandList.add("-af");
-                        commandList.add("volnorm");
-c
+C
-                        commandList.add("-af");
-c
+C
-                }
-                
@@ -246 +244 @@
-                commandList.add("44100");
-                
-c
+C
-                        commandList.add("-delay");
-c
+C
-                }
-                
@@ -427 +425 @@
-        
-        public void splitVideo(String inputVideo, int length) {
-c
+C
-                        return;
-                
-c
+C
-                        notSplitVideos.add(inputVideo);
-                        return;
-                }
-                
-c
+C
-                for (int i = 0; i < pieces; i++) {
-                        String outputVideo = inputVideo.substring(0, inputVideo.lastIndexOf('.')) + ".part" + (i + 1) + ".avi";

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

@@ -4 +4 @@
-
-public class ConverterOptions {
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-
-
+static 
-                try {
+                        Logger.logMessage("Setting: " + option + "=" + setting, Logger.INFO);
+                        
-                        if (!optionsFile.exists())
-                                optionsFile.createNewFile();
@@ -42 +62 @@
-        }
-
-
+static 
-                String returnSetting = "";
-
@@ -61 +81 @@
-        }
-
-
+static 
-                writeOption("currentProfile", profile.getProfileName());
-                writeOption("videoBitrate", "");
@@ -71 +91 @@
-        }
-
-
+static 
-                String currentProfile = readOption("currentProfile");
-                if (currentProfile.equals(""))
@@ -79 +99 @@
-        }
-        
-
+static 
-                String panAndScan = readOption("panAndScan");
-                if (panAndScan.equals(""))
@@ -87 +107 @@
-        }
-        
-
+static 
-                String videoBitrate = readOption("videoBitrate");
-                if (videoBitrate.equals(""))
@@ -95 +115 @@
-        }
-        
-
+static 
-                String audioBitrate = readOption("audioBitrate");
-                if (audioBitrate.equals(""))
@@ -103 +123 @@
-        }
-
-
+static 
-                String dimensions = readOption("dimensions");
-                if (dimensions.equals(""))
@@ -111 +131 @@
-        }
-        
-
+static 
-                String autoSync = readOption("autoSync");
-                if (autoSync.equals(""))
@@ -119 +139 @@
-        }
-        
-
+static 
-                String audioDelay = readOption("audioDelay");
-                if (audioDelay.equals(""))
@@ -127 +147 @@
-        }
-        
-
+static 
-                String autoSplit = readOption("autoSplit");
-                if (autoSplit.equals(""))
@@ -135 +155 @@
-        }
-        
-
+static 
-                String splitTime = readOption("splitTime");
-                if (splitTime.equals(""))
@@ -143 +163 @@
-        }
-        
-
+static 
-                String volumeFilter = readOption("volumeFilter");
-                if (volumeFilter.equals("") || volumeFilter.equals("none"))
@@ -153 +173 @@
-        }
-        
-
+static 
-                String gain = readOption("gain");
-                if (gain.equals(""))

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

@@ -13 +13 @@
-
-public class ConverterUI implements SelectionListener, CTabFolder2Listener, DropTargetListener {
-        private ConverterOptions converterOptions;
-        private Display display;
-        private Shell shell;
@@ -26 +25 @@
-        private ProgressDialog progressDialog;
-        
-
-
-
+
-                display = new Display();
-                
@@ -112 +109 @@
-                advancedJobs.setText("&Advanced");
-
-c
+C
-                
-                Menu advancedJobsMenu = new Menu(shell, SWT.DROP_DOWN);
@@ -172 +169 @@
-                profileMenuItems = new HashMap();
-                Profile[] profiles = Profile.getAllProfiles();
-c
+C
-                
-                Map deviceToProfile = new HashMap();
@@ -231 +228 @@
-                panAndScan.setText("&Pan and Scan\tShift+Ctrl+P");
-                panAndScan.setAccelerator(SWT.SHIFT + SWT.CTRL + 'P');
-c
+C
-                panAndScan.addSelectionListener(this);
-                
@@ -248 +245 @@
-                automaticallySplit.addSelectionListener(this);
-                
-c
+C
-                
-                volume = new MenuItem(advancedOptionsMenu, SWT.PUSH);
@@ -309 +306 @@
-                newDVDTool.addSelectionListener(this);
-        }
-
+
-        public void widgetDefaultSelected(SelectionEvent e) {
-                // empty
@@ -324 +321 @@
-                        
-                        progressDialog = new ProgressDialog(shell, SWT.NONE);
-, converterOptions
+
-                        converter.start();
-                        progressDialog.open();
@@ -415 +412 @@
-                        String selectedProfileName = (String) profileMenuItems.get(selectedMenuItem);
-                        
-c
+C
-                                return;
-                        
@@ -422 +419 @@
-                        selectedMenuItem.setSelection(true);
-                        
-c
+C
-                        profileChanged();
-                }
-                
-                if (e.getSource() == bitrate) {
-converterOptions.getCurrentProfile().getMaxVideoBitrate(), converterOptions.getCurrentProfile().getMaxAudioBitrate()), new Bitrate(converterOptions.getVideoBitrate(), c
+ConverterOptions.getCurrentProfile().getMaxVideoBitrate(), ConverterOptions.getCurrentProfile().getMaxAudioBitrate()), new Bitrate(ConverterOptions.getVideoBitrate(), C
-                        Bitrate newBitrate = bitrateDialog.open();
-c
-c
+C
+C
-                }
-
@@ -438 +435 @@
-                
-                if (e.getSource() == panAndScan)
-c
+C
-                
-                if (e.getSource() == audioSync) {
-converterOptions.getAutoSync()) ? AudioSyncDialog.AUTO_SYNC : c
+ConverterOptions.getAutoSync()) ? AudioSyncDialog.AUTO_SYNC : C
-                        
-                        if (audioDelay == AudioSyncDialog.AUTO_SYNC) {
-c
-c
+C
+C
-                        } else {
-c
-c
+C
+C
-                        }
-                }
-                
-                if (e.getSource() == automaticallySplit) {
-converterOptions.getAutoSplit(), c
+ConverterOptions.getAutoSplit(), C
-                        
-                        if (splitTime == AutomaticallySplitDialog.NO_SPLIT)
-c
+C
-                        else {
-c
-c
+C
+C
-                        }
-                }
-                
-                if (e.getSource() == volume) {
-converterOptions.getVolumeFilter(), c
+ConverterOptions.getVolumeFilter(), C
-                        
-                        if (volume == VolumeDialog.NONE)
-c
+C
-                        else if (volume == VolumeDialog.VOLNORM)
-c
+C
-                        else {
-c
-c
+C
+C
-                        }
-                }
@@ -503 +500 @@
-                dimensionsMenuItems.clear();
-                
-c
-c
+C
+C
-
-                for (int i = 0; i < dimensions.length; i++) {
@@ -515 +512 @@
-                }
-                
-c
-c
+C
+C
-        }
-        
@@ -606 +603 @@
-        private SingleVideo newSingleVideo() {
-                CTabItem tabItem = new CTabItem(tabFolder, SWT.NONE);
-, converterOptions
+
-                tabItem.setControl(singleVideo);
-                tabFolder.setSelection(tabItem);
@@ -616 +613 @@
-        private Directory newDirectory() {
-                CTabItem tabItem = new CTabItem(tabFolder, SWT.NONE);
-, converterOptions
+
-                tabItem.setControl(directory);
-                tabFolder.setSelection(tabItem);
@@ -631 +628 @@
-                
-                CTabItem tabItem = new CTabItem(tabFolder, SWT.NONE);
-, converterOptions
+
-                tabItem.setControl(dvd);
-                tabFolder.setSelection(tabItem);
@@ -647 +644 @@
-        private ManualSplit newManualSplit() {
-                CTabItem tabItem = new CTabItem(tabFolder, SWT.NONE);
-, converterOptions
+
-                tabItem.setControl(manualSplit);
-                tabFolder.setSelection(tabItem);
@@ -657 +654 @@
-        private JoinVideos newJoinVideos() {
-                CTabItem tabItem = new CTabItem(tabFolder, SWT.NONE);
-, converterOptions
+
-                tabItem.setControl(joinVideos);
-                tabFolder.setSelection(tabItem);
@@ -667 +664 @@
-        public static void main(String[] args) {
-                try {
-ConverterUI ui = 
+
-                } catch (Throwable t) {
-
+Class() + "\n" + t.get
-                        StackTraceElement[] st = t.getStackTrace();
-                        for (int i = 0; i < st.length; i++)
@@ -678 +675 @@
-                        MessageBox messageBox = new MessageBox(new Shell(Display.getDefault()), SWT.ICON_ERROR | SWT.OK);
-                        messageBox.setText("Error");
-
+The program will close.  
-                        messageBox.open();
-                }

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

@@ -13 +13 @@
-public class DVD extends Composite implements SelectionListener, TabItemControl, DVDInfo {
-        private CTabItem tabItem;
-        private ConverterOptions converterOptions;
-        private Combo dvdCombo, titleCombo, audioStreamCombo, subtitlesCombo;
-        private Map titleInfo, audioStreams, subtitles;
@@ -24 +23 @@
-        private Process proc;
-        
-, ConverterOptions converterOptions
+
-                super(parent, style);
-                this.tabItem = tabItem;
-                this.converterOptions = converterOptions;
-                
-                titleInfo = new LinkedHashMap();
@@ -214 +212 @@
-                                        }
-                        
+                                        String commandStr = "";
-                                        String[] command = new String[commandList.size()];
-
+ {
-                                                command[i] = (String) commandList.get(i);
+                                                commandStr += command[i] + " ";
+                                        }
+                                        Logger.logMessage(commandStr, Logger.INFO);
-                                        
-                                        proc = Runtime.getRuntime().exec(command);
@@ -228 +230 @@
-                        FileDialog fileDialog = new FileDialog(getShell(), SWT.SAVE);
-                        fileDialog.setText("Output Video");
-c
+C
-                                fileDialog.setFilterExtensions(new String[]{"*.mp4"});
-                                fileDialog.setFilterNames(new String[]{"MP4 Video (*.mp4)"});

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

@@ -12 +12 @@
-public class Directory extends Composite implements SelectionListener, TabItemControl, DirectoryInfo {
-        private CTabItem tabItem;
-        private ConverterOptions converterOptions;
-        private Text inputDirectoryInput, outputDirectoryInput;
-        private Button inputDirectorySelect, outputDirectorySelect, convertSubdirectories;
@@ -18 +17 @@
-        private boolean syncConvertSubdirectories;
-        
-, ConverterOptions converterOptions
+
-                super(parent, style);
-                this.tabItem = tabItem;
-                this.converterOptions = converterOptions;
-                
-                InputStream is = getClass().getResourceAsStream("icons/directory-16.png");
@@ -81 +79 @@
-                tab.setText("\t"); */
-                
-Label emptyLabel = 
+
-                
-                convertSubdirectories = new Button(this, SWT.CHECK);
@@ -101 +99 @@
-                        if (directory != null) {
-                                inputDirectoryInput.setText(directory);
-c
+C
-                                tabItem.setText(new File(directory).getName());
-                        }
@@ -123 +121 @@
-                
-                inputDirectoryInput.setText(directory);
-c
+C
-        }
-        

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

@@ -12 +12 @@
-public class JoinVideos extends Composite implements SelectionListener, TabItemControl, JoinVideosInfo {        
-        private CTabItem tabItem;
-        private ConverterOptions converterOptions;
-        private java.util.List inputVideos;
-        private List videosList;
@@ -19 +18 @@
-        private String syncOutputVideo;
-        
-, ConverterOptions converterOptions
+
-                super(parent, style);
-                this.tabItem = tabItem;
-                this.converterOptions = converterOptions;
-                inputVideos = new java.util.ArrayList();
-                

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

@@ -1 +1 @@
-package org.thestaticvoid.iriverter;
-
+import java.io.*;
-import java.util.*;
-
@@ -10 +11 @@
-import org.eclipse.swt.custom.*;
-
-
+implements SelectionListener 
-        private static LogViewer singleton;
-        private Shell shell;
+        private ToolItem save;
-        private StyledText text;
-        private java.util.List lineColors;
@@ -27 +29 @@
-                shell.setText("Log Viewer");
-                shell.setLayout(new GridLayout());
+                
+                ToolBar toolBar = new ToolBar(shell, SWT.HORIZONTAL | SWT.FLAT);
+                
+                save = new ToolItem(toolBar, SWT.PUSH);
+                InputStream is = getClass().getResourceAsStream("icons/save-24.png");
+                save.setImage(new Image(display, is));
+                save.addSelectionListener(this);
-                
-                text = new StyledText(shell, SWT.BORDER | SWT.WRAP | SWT.V_SCROLL | SWT.READ_ONLY);
@@ -48 +57 @@
-        }
-        
+        public void widgetDefaultSelected(SelectionEvent e) {
+                // empty
+        }
+        
+        public void widgetSelected(SelectionEvent e) {
+                if (e.getSource() == save) {
+                        FileDialog fileDialog = new FileDialog(getShell(), SWT.SAVE);
+                        fileDialog.setText("Output Video");
+                        fileDialog.setFilterExtensions(new String[]{"*.txt"});
+                        fileDialog.setFilterNames(new String[]{"Text Files (*.txt)"});
+                        String file = fileDialog.open();
+