src/control: a bit of cleanup here and there

[vlc] / include / libvlc_internal.h

diff --git a/include/libvlc_internal.h b/include/libvlc_internal.h
index 88d28a2a709a93c39e1114f53deefef2978a59da..6cbc8184ce83b5bead917ab0dadc0a3bb58c1bb4 100644 (file)
--- a/include/libvlc_internal.h
+++ b/include/libvlc_internal.h
@@ -5,7 +5,7 @@
  * Copyright (C) 2005 the VideoLAN team
  * $Id: control_structures.h 13752 2005-12-15 10:14:42Z oaubert $
  *
- * Authors: Clément Stenac <zorglub@videolan.org>
+ * Authors: Clément Stenac <zorglub@videolan.org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -19,7 +19,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef _LIBVLC_INTERNAL_H
@@ -31,10 +31,15 @@ extern "C" {
 
 #include <vlc/vlc.h>
 
+#ifndef WIN32
+#include <X11/Xlib.h>
+#endif
+    
 struct libvlc_instance_t
 {
     vlc_t *p_vlc;
     playlist_t *p_playlist;
+    vlm_t      *p_vlm;
     int    i_vlc_id;
 };
 
@@ -45,6 +50,9 @@ struct libvlc_input_t
     struct libvlc_instance_t *p_instance; ///< Parent instance
 };
 
+#define RAISENULL( psz ) { libvlc_exception_raise( p_e, psz ); return NULL; }
+#define RAISEVOID( psz ) { libvlc_exception_raise( p_e, psz ); return; }
+#define RAISEZERO( psz ) { libvlc_exception_raise( p_e, psz ); return 0; }
 
 # ifdef __cplusplus
 }