[vlc-devel] commit: libvlc: Properly raise an exception that indicates if VLM is disabled in libvlc. ( Pierre d'Herbemont )

[git version control]

vlc | branch: master | Pierre d'Herbemont <pdherbemont at videolan.org> | Wed Apr  9 11:53:41 2008 +0200| [665cd9209c6227c1bf494b47f40d7fd52d3cee59]

libvlc: Properly raise an exception that indicates if VLM is disabled in libvlc.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=665cd9209c6227c1bf494b47f40d7fd52d3cee59
---

 src/control/vlm.c |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/control/vlm.c b/src/control/vlm.c
index 78df6c3..c3740e0 100644
--- a/src/control/vlm.c
+++ b/src/control/vlm.c
@@ -91,10 +91,12 @@ char* libvlc_vlm_show_media( libvlc_instance_t *p_instance, char *psz_name,
     }
     free( psz_message );
     return(psz_response );
-#endif
+#else
+    libvlc_exception_raise( p_exception, "VLM has been disabled in this libvlc." );
     return NULL;
-}
 #endif
+}
+#endif /* 0 */
 
 static int libvlc_vlm_init( libvlc_instance_t *p_instance,
                             libvlc_exception_t *p_exception )
@@ -102,12 +104,15 @@ static int libvlc_vlm_init( libvlc_instance_t *p_instance,
 #ifdef ENABLE_VLM
     if( !p_instance->p_vlm )
         p_instance->p_vlm = vlm_New( p_instance->p_libvlc_int );
+#else
+    libvlc_exception_raise( p_exception, "VLM has been disabled in this libvlc." );
+    return VLC_EGENERIC;
 #endif
 
     if( !p_instance->p_vlm )
     {
         libvlc_exception_raise( p_exception,
-                                "Unable to create VLM. It might be disabled." );
+                                "Unable to create VLM." );
         return VLC_EGENERIC;
     }
     return VLC_SUCCESS;