revert convert.cs

that goes into the 2.2 branch, you stupid
murrty · Feb 22, 2020 · d00d9c8 · d00d9c8
1 parent 21de40f
commit d00d9c8
Showing 1 changed file with 13 additions and 15 deletions.
diff --git a/Classes/Convert.cs b/Classes/Convert.cs
@@ -3,6 +3,8 @@
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
 using System.Windows.Forms;
 
 namespace youtube_dl_gui {
@@ -15,9 +17,8 @@ class Convert {
                                                            "Audio Video Interleave (*.AVI)|*.avi|" +
                                                            "Flash Video (*.FLV)|*.flv|" +
                                                            "Matroska Video (*.MKV)|*.mkv|" +
-                                                           "Ogg Vorbis (*.OGV, *.OGX)|*.ogv;*.ogx|" +
                                                            "QuickTime Movie (*.MOV)|*.mov|" +
-                                                           "MPEG-4 Part 14 (*.M4A, *.MP4)|*.m4v;*.mp4|" +
+                                                           "MPEG-4 Part 14 (*.MP4)|*.mp4|" +
                                                            "WebM (*.WEBM)|*.webm|" +
                                                            "Windows Media Video (*.WMV)|*.wmv";
 
@@ -27,9 +28,9 @@ class Convert {
         public static readonly string audioFormatsFilter = "All File Formats (*.*)|*.*|" +
                                                            "Advanced Audio Codec (*.AAC)|*.aac|" +
                                                            "Free Lossless Audio Codec (*.FLAC)|*.flac|" +
-                                                           "MPEG-4 Audio (*.M4A, *.MP4)|*.m4a;*.mp4|" +
-                                                           "MPEG-1 AudioLayer III (*.MP3)|*.mp3|" +
-                                                           "Ogg Vorbis (*.OGA, *.OGG)|*.oga;*.ogg|" +
+                                                           "MPEG-4 Audio (*.M4A)|*.m4a|" +
+                                                           "MPEG-2 AudioLayer 3 (*.MP3)|*.mp3|" +
+                                                           "Ogg Vorbis (*.OGG)|*.ogg|" +
                                                            "Opus (*.OPUS)|*.opus|" +
                                                            "Waveform Audio (*.WAV)|*.wav";
 
@@ -44,10 +45,9 @@ class Convert {
                                                          "MPEG-4 Audio (*.M4A)|*.m4a|" +
                                                          "Matroska Video (*.MKV)|*.mkv|" +
                                                          "QuickTime Movie (*.MOV)|*.mov|" +
-                                                         "MPEG-1 AudioLayer III (*.MP3)|*.mp3|" +
+                                                         "MPEG-2 AudioLayer 3 (*.MP3)|*.mp3|" +
                                                          "MPEG-4 Part 14 (*.MP4)|*.mp4|" +
-                                                         "Ogg Vorbis Audio (*.OGA, *.OGG)|*.oga;*.ogg|" +
-                                                         "Ogg Vorbis Video (*.OGV, *.OGX)|*.ogv;*.ogx|" +
+                                                         "Ogg Vorbis (*.OGG)|*.ogg|" +
                                                          "Opus (*.OPUS)|*.opus|" +
                                                          "Waveform Audio (*.WAV)|*.wav|" +
                                                          "WebM (*.WEBM)|*.webm|" +
@@ -56,17 +56,15 @@ class Convert {
         /// <summary>
         /// All built-in video formats in a single filter
         /// </summary>
-        public static readonly string allVideoFormats = "All Video Formats|" + "*.avi;*.flv;*.mkv;*.mov;*.ogv;*.ogx;*.m4a;*.mp4;*.webm;*.wmv";
+        public static readonly string allVideoFormats = "All Video Formats|*.avi;*.flv;*.mkv;*.mov;*.mp4;*.webm;*.wmv";
         /// <summary>
         /// All built-in audio formats in a single filter
         /// </summary>
-        public static readonly string allAudioFormats = "All Audio Formats|" +
-            "*.aac;*.flac;*.m4a;*.mp4;*.mp3;*.opus;*.oga;*.ogg;*.wav";
+        public static readonly string allAudioFormats = "All Audio Formats|*.aac;*.flac;*.m4a;*.mp3;*.opus;*.ogg;*.wav";
         /// <summary>
         /// All built-in audio and video formats in a single filter
         /// </summary>
-        public static readonly string allMediaFormats = "All Media Formats|" +
-            "*.aac;*.avi;*.flac;*.flv;*.m4a;*.mkv;*.mov;*.mp3;*.mp4;*.ogg;*.opus;*.wav;*.webm;*.wmv";
+        public static readonly string allMediaFormats = "All Media Formats|*.aac;*.avi;*.flac;*.flv;*.m4a;*.mkv;*.mov;*.mp3;*.mp4;*.ogg;*.opus;*.wav;*.webm;*.wmv";
 
         /// <summary>
         /// Temporary array of video qualities. Not used, just for reference.
@@ -227,7 +225,7 @@ public static bool convertFile(string input, string output, int convType = -1) {
                 return true;
             }
             catch (Exception ex) {
-                ErrorLog.ReportException(ex);
+                ErrorLog.reportError(ex);
                 return false;
             }
         }
@@ -307,7 +305,7 @@ public static bool mergeFiles(string input1, string input2, string output, bool
                 return true;
             }
             catch (Exception ex) {
-                ErrorLog.ReportException(ex);
+                ErrorLog.reportError(ex);
                 return false;
             }
         }