* @return The media library object. NULL if the media library
* object could not be loaded
*/
-VLC_EXPORT( media_library_t*, __ml_Hold, ( vlc_object_t* p_this ) );
-#define ml_Hold( a ) __ml_Hold( VLC_OBJECT(a) )
+VLC_EXPORT( media_library_t*, ml_Hold, ( vlc_object_t* p_this ) );
+#define ml_Hold( a ) ml_Hold( VLC_OBJECT(a) )
/**
* @brief Discard your ref to media library
* @param p_this The object holding the media library
*/
-VLC_EXPORT( void, __ml_Release, ( vlc_object_t* p_this ) );
-#define ml_Release(a) __ml_Release( VLC_OBJECT(a))
+VLC_EXPORT( void, ml_Release, ( vlc_object_t* p_this ) );
+#define ml_Release(a) ml_Release( VLC_OBJECT(a) )
/**
* @brief Create a Media Library VLC object.
* @param psz_name Name for the module
* @return The ML object.
*/
-VLC_EXPORT( media_library_t*, __ml_Create, ( vlc_object_t *p_this, char* psz_name ) );
+VLC_EXPORT( media_library_t*, ml_Create, ( vlc_object_t *p_this, char* psz_name ) );
/**
* @brief Destructor for the Media library singleton
* @param p_this Parent the ML object is attached to
*/
-VLC_EXPORT( void, __ml_Destroy, ( vlc_object_t* p_this ) );
+VLC_EXPORT( void, ml_Destroy, ( vlc_object_t* p_this ) );
/**
* @brief Control the Media Library
* If op = ML_OP_NONE, then you are connecting to a tree consisting of
* only SPECIAL nodes.
* If op = ML_OP_NOT, then right MUST be NULL
- * op must not be ML_OP_SPECIAL, @see __ml_FtreeSpec
+ * op must not be ML_OP_SPECIAL, @see ml_FtreeSpec
* @param left part of the tree
* @param right part of the tree
* @return Pointer to new tree
* @return Pointer to new tree
* @note Use the helpers
*/
-VLC_EXPORT( ml_ftree_t*, __ml_FtreeSpec, ( ml_ftree_t* tree,
+VLC_EXPORT( ml_ftree_t*, ml_FtreeSpec, ( ml_ftree_t* tree,
ml_select_e crit,
int limit,
char* sort ) );
#define ml_FtreeOr( left, right ) ml_OpConnectChilds( ML_OP_OR, left, right )
#define ml_FtreeNot( left ) ml_OpConnectChilds( ML_OP_NOT, left, NULL )
-#define ml_FtreeSpecAsc( tree, str ) __ml_FtreeSpec( tree, ML_SORT_ASC, 0, str )
-#define ml_FtreeSpecDesc( tree, str ) __ml_FtreeSpec( tree, ML_SORT_DESC, 0, str )
-#define ml_FtreeSpecLimit( tree, limit ) __ml_FtreeSpec( tree, ML_LIMIT, limit, NULL )
-#define ml_FtreeSpecDistinct( tree ) __ml_FtreeSpec( tree, ML_DISTINCT, 0, NULL )
+#define ml_FtreeSpecAsc( tree, str ) ml_FtreeSpec( tree, ML_SORT_ASC, 0, str )
+#define ml_FtreeSpecDesc( tree, str ) ml_FtreeSpec( tree, ML_SORT_DESC, 0, str )
+#define ml_FtreeSpecLimit( tree, limit ) ml_FtreeSpec( tree, ML_LIMIT, limit, NULL )
+#define ml_FtreeSpecDistinct( tree ) ml_FtreeSpec( tree, ML_DISTINCT, 0, NULL )
/*****************************************************************************
* @param id The id of the row to update
* @param ... The update data. [SelectType [RoleType] Value]
*/
-#define ml_UpdateSimple( ml, sel, lval, id, ... ) \
- __ml_UpdateSimple( ml, sel, lval, id, __VA_ARGS__, ML_END )
-VLC_EXPORT( int, __ml_UpdateSimple, ( media_library_t *p_media_library,
+VLC_EXPORT( int, ml_UpdateSimple, ( media_library_t *p_media_library,
ml_select_e selected_type,
const char* psz_lvalue,
int id, ... ) );
+#define ml_UpdateSimple( ml, sel, lval, id, ... ) \
+ ml_UpdateSimple( ml, sel, lval, id, __VA_ARGS__, ML_END )
/**
* @brief Generic DELETE function
* @brief Destroy the medialibrary object
* @param Parent object that holds the media library object
*/
-void __ml_Destroy( vlc_object_t * p_this )
+void ml_Destroy( vlc_object_t * p_this )
{
media_library_t* p_ml = ( media_library_t* )p_this;
module_unneed( p_ml, p_ml->p_module );
* @return p_ml created and attached, module loaded. NULL if
* not able to load
*/
-media_library_t *__ml_Create( vlc_object_t *p_this, char *psz_name )
+media_library_t *ml_Create( vlc_object_t *p_this, char *psz_name )
{
media_library_t *p_ml = NULL;
return p_ml;
}
+#undef ml_Hold
/**
* @brief Acquire a reference to the media library singleton
* @param p_this Object that holds the reference
* @return media_library_t The ml object. NULL if not compiled with
* media library or if unable to load
*/
-media_library_t* __ml_Hold( vlc_object_t* p_this )
+media_library_t* ml_Hold( vlc_object_t* p_this )
{
media_library_t* p_ml = NULL;
p_ml = libvlc_priv (p_this->p_libvlc)->p_ml;
var_GetBool( p_this->p_libvlc, "load-media-library-on-startup" ) == false )
{
libvlc_priv (p_this->p_libvlc)->p_ml
- = __ml_Create( VLC_OBJECT( p_this->p_libvlc ), NULL );
+ = ml_Create( VLC_OBJECT( p_this->p_libvlc ), NULL );
p_ml = libvlc_priv (p_this->p_libvlc)->p_ml;
}
if( p_ml )
return p_ml;
}
+#undef ml_Release
/**
* @brief Release a reference to the media library singleton
* @param p_this Object that holds the reference
*/
-void __ml_Release( vlc_object_t* p_this )
+void ml_Release( vlc_object_t* p_this )
{
media_library_t* p_ml;
p_ml = libvlc_priv (p_this->p_libvlc)->p_ml;
return p_ml->functions.pf_GetMedia( p_ml, id, select, reload );
}
+#undef ml_UpdateSimple
/**
* @brief Update a given table
* @param p_media_library The media library object
* @param id The id of the row to update
* @param ... The update data. [SelectType [RoleType] Value] ... ML_END
*/
-int __ml_UpdateSimple( media_library_t *p_media_library,
+int ml_UpdateSimple( media_library_t *p_media_library,
ml_select_e selected_type,
const char* psz_lvalue,
int id, ... )
* If op = ML_OP_NONE, then you are connecting to a tree consisting of
* only SPECIAL nodes.
* If op = ML_OP_NOT, then right MUST be NULL
- * op must not be ML_OP_SPECIAL, @see __ml_FtreeSpec
+ * op must not be ML_OP_SPECIAL, @see ml_FtreeSpec
* @param left part of the tree
* @param right part of the tree
* @return Pointer to new tree
return p_parent;
}
+#undef ml_FtreeSpec
/**
* @brief Attaches a special node to a tree
* @param tree Tree to attach special node to
* @return Pointer to new tree
* @note Use the helpers
*/
-ml_ftree_t* __ml_FtreeSpec( ml_ftree_t* tree,
+ml_ftree_t* ml_FtreeSpec( ml_ftree_t* tree,
ml_select_e crit,
int limit,
char* sort )
#ifndef MEDIA_LIBRARY
#include<vlc_media_library.h>
-media_library_t* __ml_Hold ( vlc_object_t* p_this )
+#undef ml_Hold
+media_library_t* ml_Hold ( vlc_object_t* p_this )
{
VLC_UNUSED( p_this );
return NULL;
}
-void __ml_Release ( vlc_object_t* p_this )
+#undef ml_Release
+void ml_Release ( vlc_object_t* p_this )
{
VLC_UNUSED( p_this );
assert( 0 );
}
-media_library_t* __ml_Create ( vlc_object_t *p_this, char* psz_name )
+media_library_t* ml_Create ( vlc_object_t *p_this, char* psz_name )
{
VLC_UNUSED( p_this );
VLC_UNUSED( psz_name );
return NULL;
}
-void __ml_Destroy( vlc_object_t * p_this )
+void ml_Destroy( vlc_object_t * p_this )
{
VLC_UNUSED( p_this );
assert( 0 );
return NULL;
}
-int __ml_UpdateSimple( media_library_t *p_media_library, ml_select_e selected_type,
+#undef ml_UpdateSimple
+int ml_UpdateSimple( media_library_t *p_media_library, ml_select_e selected_type,
const char* psz_lvalue, int id, ... )
{
VLC_UNUSED( p_media_library );
return NULL;
}
-ml_ftree_t* __ml_FtreeSpec( ml_ftree_t* tree, ml_select_e crit, int limit,
+ml_ftree_t* ml_FtreeSpec( ml_ftree_t* tree, ml_select_e crit, int limit,
char* sort )
{
VLC_UNUSED( tree );