tools/gst-launch.c: Remove crufy code. GOption does not need this workaround.

Original commit message from CVS:
* tools/gst-launch.c: (main):
Remove crufy code. GOption does not need this workaround.

diff --git a/ChangeLog b/ChangeLog
index 434f8bd5e668c1bd34b43a4bcb11ef33cf9e4c0c..33319a8be726dd2b95794a5a839adee06c1da34a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-06-15  Stefan Kost  <ensonic@users.sf.net>
+
+       * tools/gst-launch.c: (main):
+         Remove crufy code. GOption does not need this workaround.
+
 2007-06-14  Stefan Kost  <ensonic@users.sf.net>
 
        * libs/gst/controller/gstcontroller.c:

diff --git a/tools/gst-launch.c b/tools/gst-launch.c
index 6a583b188021c28ca0ed60eb4ff0983705491e14..616e5b89482eb4399c9a0dba72c19d7bc0386ea0 100644 (file)
--- a/tools/gst-launch.c
+++ b/tools/gst-launch.c
@@ -558,8 +558,6 @@ exit:
 int
 main (int argc, char *argv[])
 {
-  gint i, j;
-
   /* options */
   gboolean verbose = FALSE;
   gboolean no_fault = FALSE;
@@ -619,25 +617,6 @@ main (int argc, char *argv[])
 
   gst_tools_print_version ("gst-launch");
 
-  /* FIXpopt: strip short args, too. We do it ourselves for now */
-  j = 1;
-  for (i = 1; i < argc; i++) {
-    if (*(argv[i]) == '-') {
-      if (strlen (argv[i]) == 2) {
-        gchar *c = argv[i];
-
-        c++;
-        if (*c == 'X' || *c == 'o') {
-          i++;
-        }
-      }
-    } else {
-      argv[j] = argv[i];
-      j++;
-    }
-  }
-  argc = j;
-
 #ifndef DISABLE_FAULT_HANDLER
   if (!no_fault)
     fault_setup ();