From 7c912f1eda4ff437d3d6f2a44080512a57e314b4 Mon Sep 17 00:00:00 2001
From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net>
Date: Sun, 24 Jan 2010 11:51:42 +0200
Subject: [PATCH] libvlc_playlist_play: remove unused exception

---
 bin/vlc.c                | 5 ++---
 bin/winvlc.c             | 6 ++----
 include/vlc/deprecated.h | 3 +--
 src/control/playlist.c   | 4 +---
 4 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/bin/vlc.c b/bin/vlc.c
index de2b87851d..b76d8fb121 100644
--- a/bin/vlc.c
+++ b/bin/vlc.c
@@ -150,9 +150,8 @@ int main( int i_argc, const char *ppsz_argv[] )
             return 1; // BOOM!
     argv[argc] = NULL;
 
-    libvlc_exception_t ex, dummy;
+    libvlc_exception_t ex;
     libvlc_exception_init (&ex);
-    libvlc_exception_init (&dummy);
 
     /* Initialize libvlc */
     libvlc_instance_t *vlc = libvlc_new (argc, argv, &ex);
@@ -166,7 +165,7 @@ int main( int i_argc, const char *ppsz_argv[] )
 #endif
         if (libvlc_add_intf (vlc, NULL) == 0)
         {
-            libvlc_playlist_play (vlc, -1, 0, NULL, &dummy);
+            libvlc_playlist_play (vlc, -1, 0, NULL);
             libvlc_wait (vlc);
         }
         libvlc_release (vlc);
diff --git a/bin/winvlc.c b/bin/winvlc.c
index 5bec350613..6e933856cf 100644
--- a/bin/winvlc.c
+++ b/bin/winvlc.c
@@ -162,9 +162,8 @@ int WINAPI WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance,
     argc = parse_cmdline (psz_cmdline, &argv);
 #endif
 
-    libvlc_exception_t ex, dummy;
+    libvlc_exception_t ex;
     libvlc_exception_init (&ex);
-    libvlc_exception_init (&dummy);
 
     /* Initialize libvlc */
     libvlc_instance_t *vlc;
@@ -173,14 +172,13 @@ int WINAPI WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance,
     {
         libvlc_add_intf (vlc, "globalhotkeys,none");
         libvlc_add_intf (vlc, NULL);
-        libvlc_playlist_play (vlc, -1, 0, NULL, &dummy);
+        libvlc_playlist_play (vlc, -1, 0, NULL);
         libvlc_wait (vlc);
         libvlc_release (vlc);
     }
 
     ret = libvlc_exception_raised (&ex);
     libvlc_exception_clear (&ex);
-    libvlc_exception_clear (&dummy);
 
     for (int i = 0; i < argc; i++)
         free (argv[i]);
diff --git a/include/vlc/deprecated.h b/include/vlc/deprecated.h
index e946b77f6b..97cb97a881 100644
--- a/include/vlc/deprecated.h
+++ b/include/vlc/deprecated.h
@@ -63,10 +63,9 @@ extern "C" {
  *        played
  * \param i_options the number of options to add to the item
  * \param ppsz_options the options to add to the item
- * \param p_e an initialized exception pointer
  */
 VLC_DEPRECATED_API void libvlc_playlist_play( libvlc_instance_t*, int, int,
-                                          char **, libvlc_exception_t * );
+                                          char ** );
 
 /** @}*/
 
diff --git a/src/control/playlist.c b/src/control/playlist.c
index b1c7ccebfd..79f274cda5 100644
--- a/src/control/playlist.c
+++ b/src/control/playlist.c
@@ -39,12 +39,10 @@
 #include <assert.h>
 
 void libvlc_playlist_play( libvlc_instance_t *p_instance, int i_id,
-                           int i_options, char **ppsz_options,
-                           libvlc_exception_t *p_e )
+                           int i_options, char **ppsz_options )
 {
     playlist_t *pl = libvlc_priv (p_instance->p_libvlc_int)->p_playlist;
     VLC_UNUSED(i_id); VLC_UNUSED(i_options); VLC_UNUSED(ppsz_options);
-    VLC_UNUSED(p_e);
 
     assert( pl );
     if( pl->items.i_size == 0 )
-- 
2.39.2