Commit a206b9f5 authored by Rémi Duraffort's avatar Rémi Duraffort

libvlcpp: getSomething => something

parent da79f90e
...@@ -37,22 +37,22 @@ libVLC::~libVLC() ...@@ -37,22 +37,22 @@ libVLC::~libVLC()
libvlc_release( m_instance ); libvlc_release( m_instance );
} }
libvlc_instance_t *libVLC::getInstance() libvlc_instance_t *libVLC::instance()
{ {
return m_instance; return m_instance;
} }
const char *libVLC::getVersion() const char *libVLC::version()
{ {
return libvlc_get_version(); return libvlc_get_version();
} }
const char *libVLC::getCompiler() const char *libVLC::compiler()
{ {
return libvlc_get_compiler(); return libvlc_get_compiler();
} }
const char *libVLC::getChanset() const char *libVLC::chanset()
{ {
return libvlc_get_changeset(); return libvlc_get_changeset();
} }
...@@ -49,26 +49,26 @@ public: ...@@ -49,26 +49,26 @@ public:
* Get the version of libVLC * Get the version of libVLC
* @return the version * @return the version
*/ */
const char *getVersion(); const char *version();
/** /**
* Get the compiler use for this binari * Get the compiler use for this binari
* @return the compiler used * @return the compiler used
*/ */
const char *getCompiler(); const char *compiler();
/** /**
* Get the chanset of libvlc * Get the chanset of libvlc
* @return thje changeset * @return thje changeset
*/ */
const char *getChanset(); const char *chanset();
private: private:
/** /**
* Get the instance of libvlc that cannot be modified * Get the instance of libvlc that cannot be modified
* @return the instance of libvlc * @return the instance of libvlc
*/ */
libvlc_instance_t *getInstance(); libvlc_instance_t *instance();
/** The instance of libvlc */ /** The instance of libvlc */
libvlc_instance_t *m_instance; libvlc_instance_t *m_instance;
......
...@@ -29,7 +29,7 @@ using namespace libvlc; ...@@ -29,7 +29,7 @@ using namespace libvlc;
Media::Media( libVLC &libvlcInstance, const char *psz_mrl ) Media::Media( libVLC &libvlcInstance, const char *psz_mrl )
{ {
Exception ex; Exception ex;
m_media = libvlc_media_new( libvlcInstance.getInstance(), psz_mrl, &ex.ex ); m_media = libvlc_media_new( libvlcInstance.instance(), psz_mrl, &ex.ex );
} }
Media::Media( const Media& original ) Media::Media( const Media& original )
...@@ -52,7 +52,7 @@ void Media::addOption( const char *ppsz_options, libvlc_media_option_t flag ) ...@@ -52,7 +52,7 @@ void Media::addOption( const char *ppsz_options, libvlc_media_option_t flag )
libvlc_media_add_option_flag( m_media, ppsz_options, flag ); libvlc_media_add_option_flag( m_media, ppsz_options, flag );
} }
int64_t Media::getDuration() int64_t Media::duration()
{ {
Exception ex; Exception ex;
return libvlc_media_get_duration( m_media, &ex.ex ); return libvlc_media_get_duration( m_media, &ex.ex );
...@@ -63,12 +63,12 @@ int Media::isPreparsed() ...@@ -63,12 +63,12 @@ int Media::isPreparsed()
return libvlc_media_is_preparsed( m_media ); return libvlc_media_is_preparsed( m_media );
} }
char *Media::getMrl() char *Media::mrl()
{ {
return libvlc_media_get_mrl( m_media ); return libvlc_media_get_mrl( m_media );
} }
char *Media::getMeta( libvlc_meta_t e_meta ) char *Media::meta( libvlc_meta_t e_meta )
{ {
return libvlc_media_get_meta( m_media, e_meta ); return libvlc_media_get_meta( m_media, e_meta );
} }
...@@ -83,7 +83,7 @@ int Media::saveMeta() ...@@ -83,7 +83,7 @@ int Media::saveMeta()
return libvlc_media_save_meta( m_media ); return libvlc_media_save_meta( m_media );
} }
libvlc_state_t Media::getState() libvlc_state_t Media::state()
{ {
return libvlc_media_get_state( m_media ); return libvlc_media_get_state( m_media );
} }
...@@ -93,12 +93,12 @@ void Media::setUserData( void *p_user_data ) ...@@ -93,12 +93,12 @@ void Media::setUserData( void *p_user_data )
libvlc_media_set_user_data( m_media, p_user_data ); libvlc_media_set_user_data( m_media, p_user_data );
} }
void *Media::getUserData() void *Media::userData()
{ {
return libvlc_media_get_user_data( m_media ); return libvlc_media_get_user_data( m_media );
} }
libvlc_media_t *Media::getInstance() libvlc_media_t *Media::instance()
{ {
return m_media; return m_media;
} }
...@@ -73,7 +73,7 @@ public: ...@@ -73,7 +73,7 @@ public:
* Get the duration of the media * Get the duration of the media
* @return the duration * @return the duration
*/ */
int64_t getDuration(); int64_t duration();
/** /**
* Get preparsed status of the media * Get preparsed status of the media
...@@ -85,14 +85,14 @@ public: ...@@ -85,14 +85,14 @@ public:
* Get the MRL of the media * Get the MRL of the media
* @return the MRL of the media * @return the MRL of the media
*/ */
char *getMrl(); char *mrl();
/** /**
* Get the requiered meta * Get the requiered meta
* @param e_meta: type of the meta * @param e_meta: type of the meta
* @return the requiered meta * @return the requiered meta
*/ */
char *getMeta( libvlc_meta_t e_meta ); char *meta( libvlc_meta_t e_meta );
/** /**
* Set the given meta * Set the given meta
...@@ -111,16 +111,16 @@ public: ...@@ -111,16 +111,16 @@ public:
* Get the state of the media * Get the state of the media
* @return the state of the media * @return the state of the media
*/ */
libvlc_state_t getState(); libvlc_state_t state();
/** /**
* Get some statistics about this media * Get some statistics about this media
* @return the statistics * @return the statistics
*/ */
libvlc_media_stats_t *getStats(); libvlc_media_stats_t *stats();
/**\todo: getSubItems */ /**\todo: subItems */
/**\todo: getEventManager */ /**\todo: eventManager */
/** /**
* Set media descriptor's user data * Set media descriptor's user data
...@@ -132,14 +132,14 @@ public: ...@@ -132,14 +132,14 @@ public:
* Retrive user data specified by a call to setUserData * Retrive user data specified by a call to setUserData
* @return the user data pointer * @return the user data pointer
*/ */
void *getUserData(); void *userData();
private: private:
/** /**
* Get the instance of the libvlc_media_t * Get the instance of the libvlc_media_t
* @return the pointer to libvlc_media_t * @return the pointer to libvlc_media_t
*/ */
libvlc_media_t *getInstance(); libvlc_media_t *instance();
/** The media */ /** The media */
libvlc_media_t *m_media; libvlc_media_t *m_media;
......
...@@ -29,13 +29,13 @@ using namespace libvlc; ...@@ -29,13 +29,13 @@ using namespace libvlc;
MediaPlayer::MediaPlayer( libVLC &libvlcInstance ) MediaPlayer::MediaPlayer( libVLC &libvlcInstance )
{ {
Exception ex; Exception ex;
m_player = libvlc_media_player_new( libvlcInstance.getInstance(), &ex.ex ); m_player = libvlc_media_player_new( libvlcInstance.instance(), &ex.ex );
} }
MediaPlayer::MediaPlayer( Media &media ) MediaPlayer::MediaPlayer( Media &media )
{ {
Exception ex; Exception ex;
m_player = libvlc_media_player_new_from_media( media.getInstance(), &ex.ex ); m_player = libvlc_media_player_new_from_media( media.instance(), &ex.ex );
} }
MediaPlayer::~MediaPlayer() MediaPlayer::~MediaPlayer()
...@@ -46,7 +46,7 @@ MediaPlayer::~MediaPlayer() ...@@ -46,7 +46,7 @@ MediaPlayer::~MediaPlayer()
void MediaPlayer::setMedia( Media &media ) void MediaPlayer::setMedia( Media &media )
{ {
Exception ex; Exception ex;
libvlc_media_player_set_media( m_player, media.getInstance(), &ex.ex ); libvlc_media_player_set_media( m_player, media.instance(), &ex.ex );
} }
int MediaPlayer::isPlaying() int MediaPlayer::isPlaying()
...@@ -79,7 +79,7 @@ void MediaPlayer::setNSObject( void *drawable ) ...@@ -79,7 +79,7 @@ void MediaPlayer::setNSObject( void *drawable )
libvlc_media_player_set_nsobject( m_player, drawable, &ex.ex ); libvlc_media_player_set_nsobject( m_player, drawable, &ex.ex );
} }
void* MediaPlayer::getNSObject() void* MediaPlayer::nsobject()
{ {
return libvlc_media_player_get_nsobject( m_player ); return libvlc_media_player_get_nsobject( m_player );
} }
...@@ -90,7 +90,7 @@ void MediaPlayer::setAgl( uint32_t drawable ) ...@@ -90,7 +90,7 @@ void MediaPlayer::setAgl( uint32_t drawable )
libvlc_media_player_set_agl( m_player, drawable, &ex.ex ); libvlc_media_player_set_agl( m_player, drawable, &ex.ex );
} }
uint32_t MediaPlayer::getAgl() uint32_t MediaPlayer::agl()
{ {
return libvlc_media_player_get_agl( m_player ); return libvlc_media_player_get_agl( m_player );
} }
...@@ -101,7 +101,7 @@ void MediaPlayer::setXWindow( uint32_t drawable ) ...@@ -101,7 +101,7 @@ void MediaPlayer::setXWindow( uint32_t drawable )
libvlc_media_player_set_xwindow( m_player, drawable, &ex.ex ); libvlc_media_player_set_xwindow( m_player, drawable, &ex.ex );
} }
uint32_t MediaPlayer::getXWindow() uint32_t MediaPlayer::xwindow()
{ {
return libvlc_media_player_get_xwindow( m_player ); return libvlc_media_player_get_xwindow( m_player );
} }
...@@ -112,18 +112,18 @@ void MediaPlayer::setHwnd( void *drawable ) ...@@ -112,18 +112,18 @@ void MediaPlayer::setHwnd( void *drawable )
libvlc_media_player_set_hwnd( m_player, drawable, &ex.ex ); libvlc_media_player_set_hwnd( m_player, drawable, &ex.ex );
} }
void *MediaPlayer::getHwnd() void *MediaPlayer::hwnd()
{ {
return libvlc_media_player_get_hwnd( m_player ); return libvlc_media_player_get_hwnd( m_player );
} }
int64_t MediaPlayer::getLenght() int64_t MediaPlayer::lenght()
{ {
Exception ex; Exception ex;
return libvlc_media_player_get_length( m_player, &ex.ex ); return libvlc_media_player_get_length( m_player, &ex.ex );
} }
int64_t MediaPlayer::getTime() int64_t MediaPlayer::time()
{ {
Exception ex; Exception ex;
return libvlc_media_player_get_time( m_player, &ex.ex ); return libvlc_media_player_get_time( m_player, &ex.ex );
...@@ -135,7 +135,7 @@ void MediaPlayer::setTime( int64_t new_time ) ...@@ -135,7 +135,7 @@ void MediaPlayer::setTime( int64_t new_time )
libvlc_media_player_set_time( m_player, new_time, &ex.ex ); libvlc_media_player_set_time( m_player, new_time, &ex.ex );
} }
float MediaPlayer::getPosition() float MediaPlayer::position()
{ {
Exception ex; Exception ex;
return libvlc_media_player_get_position( m_player, &ex.ex ); return libvlc_media_player_get_position( m_player, &ex.ex );
...@@ -147,13 +147,13 @@ void MediaPlayer::setPosition( float position ) ...@@ -147,13 +147,13 @@ void MediaPlayer::setPosition( float position )
libvlc_media_player_set_position( m_player, position, &ex.ex ); libvlc_media_player_set_position( m_player, position, &ex.ex );
} }
int MediaPlayer::getChapter() int MediaPlayer::chapter()
{ {
Exception ex; Exception ex;
return libvlc_media_player_get_chapter( m_player, &ex.ex ); return libvlc_media_player_get_chapter( m_player, &ex.ex );
} }
int MediaPlayer::getChapterCount() int MediaPlayer::chapterCount()
{ {
Exception ex; Exception ex;
return libvlc_media_player_get_chapter_count( m_player, &ex.ex ); return libvlc_media_player_get_chapter_count( m_player, &ex.ex );
...@@ -165,9 +165,3 @@ int MediaPlayer::willPlay() ...@@ -165,9 +165,3 @@ int MediaPlayer::willPlay()
return libvlc_media_player_will_play( m_player, &ex.ex ); return libvlc_media_player_will_play( m_player, &ex.ex );
} }
/*int MediaPlayer::getTitle()
{
Exception ex;
return libvlc_media_player_get_title( m_player, &ex.ex );
}*/
...@@ -64,13 +64,13 @@ public: ...@@ -64,13 +64,13 @@ public:
* Get the media associated with the player * Get the media associated with the player
* @return the media * @return the media
*/ */
///@todo getMedia(); ///@todo media();
/** /**
* Get the event manager associated to the media player * Get the event manager associated to the media player
* @return the event manager * @return the event manager
*/ */
///@todo getEventManager() ///@todo eventManager()
/** /**
* Is the player playing * Is the player playing
...@@ -104,7 +104,7 @@ public: ...@@ -104,7 +104,7 @@ public:
* Get the NSView handler associated with the media player * Get the NSView handler associated with the media player
* @return the NSView handler * @return the NSView handler
*/ */
void* getNSObject(); void* nsobject();
/** /**
* Set the agl handler where the media player shoud render the video * Set the agl handler where the media player shoud render the video
...@@ -116,7 +116,7 @@ public: ...@@ -116,7 +116,7 @@ public:
* Get the agl handler associated with the media player * Get the agl handler associated with the media player
* @return the agl handler * @return the agl handler
*/ */
uint32_t getAgl(); uint32_t agl();
/** /**
* Set the X Window drawable where the media player shoud render the video * Set the X Window drawable where the media player shoud render the video
...@@ -128,7 +128,7 @@ public: ...@@ -128,7 +128,7 @@ public:
* Get the X Window drawable associated with the media player * Get the X Window drawable associated with the media player
* @return the X Window drawable * @return the X Window drawable
*/ */
uint32_t getXWindow(); uint32_t xwindow();
/** /**
* Set the Win32/Win64 API window handle where the media player shoud * Set the Win32/Win64 API window handle where the media player shoud
...@@ -141,20 +141,20 @@ public: ...@@ -141,20 +141,20 @@ public:
* Get the Win32/Win64 API window handle associated with the media player * Get the Win32/Win64 API window handle associated with the media player
* @return the windows handle * @return the windows handle
*/ */
void *getHwnd(); void *hwnd();
/** /**
* Get the movie lenght (in ms) * Get the movie lenght (in ms)
* @return the movie length * @return the movie length
*/ */
int64_t getLenght(); int64_t lenght();
/** /**
* Get the current movie time (in ms) * Get the current movie time (in ms)
* @return the current movie time * @return the current movie time
*/ */
int64_t getTime(); int64_t time();
/** /**
* Set the movie time (in ms) * Set the movie time (in ms)
...@@ -166,7 +166,7 @@ public: ...@@ -166,7 +166,7 @@ public:
* Get the movie position (in percent) * Get the movie position (in percent)
* @return the movie position * @return the movie position
*/ */
float getPosition(); float position();
/** /**
* Set the movie position (in percent) * Set the movie position (in percent)
...@@ -178,13 +178,13 @@ public: ...@@ -178,13 +178,13 @@ public:
* Get the current movie chapter * Get the current movie chapter
* @return the current chapter * @return the current chapter
*/ */
int getChapter(); int chapter();
/** /**
* Get the movie chapter count * Get the movie chapter count
* @return the movie chapter count * @return the movie chapter count
*/ */
int getChapterCount(); int chapterCount();
/** /**
* Is the player going to play the media (not dead or dying) * Is the player going to play the media (not dead or dying)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment