Replace #if XP_SYMBOL with #if defined(XP_SYMBOL) for consistency.

[vlc] / projects / mozilla / vlcplugin.cpp

diff --git a/projects/mozilla/vlcplugin.cpp b/projects/mozilla/vlcplugin.cpp
index daed0c9c233ff17fe4b03f6248f7baef4894b404..3b28018b5ca4b572c751a5658709d3b668b7c57f 100644 (file)
--- a/projects/mozilla/vlcplugin.cpp
+++ b/projects/mozilla/vlcplugin.cpp
@@ -54,10 +54,10 @@ VlcPlugin::VlcPlugin( NPP instance, uint16 mode ) :
     p_scriptClass(NULL),
     p_browser(instance),
     psz_baseURL(NULL)
-#if XP_WIN
+#if defined(XP_WIN)
     ,pf_wndproc(NULL)
 #endif
-#if XP_UNIX
+#if defined(XP_UNIX)
     ,i_width((unsigned)-1)
     ,i_height((unsigned)-1)
     ,i_tb_width(0)
@@ -74,7 +74,7 @@ VlcPlugin::VlcPlugin( NPP instance, uint16 mode ) :
 #endif
 {
     memset(&npwindow, 0, sizeof(NPWindow));
-#if XP_UNIX
+#if defined(XP_UNIX)
     memset(&npvideo, 0, sizeof(Window));
     memset(&npcontrol, 0, sizeof(Window));
 #endif
@@ -328,14 +328,7 @@ int VlcPlugin::playlist_add_extended_untrusted( const char *mrl, const char *nam
         return -1;
 
     for( int i = 0; i < optc; ++i )
-    {
-        libvlc_media_add_option_flag(p_m, optv[i], libvlc_media_option_unique, ex);
-        if( libvlc_exception_raised(ex) )
-        {
-            libvlc_media_release(p_m);
-            return -1;
-        }
-    }
+        libvlc_media_add_option_flag(p_m, optv[i], libvlc_media_option_unique);
 
     libvlc_media_list_lock(libvlc_media_list);
     libvlc_media_list_add_media(libvlc_media_list,p_m,ex);
@@ -593,7 +586,7 @@ relativeurl:
     return NULL;
 }
 
-#if XP_UNIX
+#if defined(XP_UNIX)
 int  VlcPlugin::setSize(unsigned width, unsigned height)
 {
     int diff = (width != i_width) || (height != i_height);
@@ -755,8 +748,7 @@ void VlcPlugin::redrawToolbar()
     libvlc_exception_init( &ex );
 
     /* get mute info */
-    b_mute = libvlc_audio_get_mute( getVLC(), &ex );
-    libvlc_exception_clear( &ex );
+    b_mute = libvlc_audio_get_mute( getVLC() );
 
     gcv.foreground = BlackPixel( p_display, 0 );
     gc = XCreateGC( p_display, control, GCForeground, &gcv );
@@ -864,8 +856,7 @@ vlc_toolbar_clicked_t VlcPlugin::getToolbarButtonClicked( int i_xpos, int i_ypos
     libvlc_exception_clear( &ex );
 
     /* get mute info */
-    b_mute = libvlc_audio_get_mute( getVLC(), &ex );
-    libvlc_exception_clear( &ex );
+    b_mute = libvlc_audio_get_mute( getVLC() );
 
     /* is Pause of Play button clicked */
     if( (is_playing != 1) &&