diff --git a/libvlc_Instance.cpp b/libvlc_Instance.cpp index 74b17e4521be2c6f367ff8dadb7bc20e3cc44418..d846beea509fb7758f32caf9be70efee0a47a271 100644 --- a/libvlc_Instance.cpp +++ b/libvlc_Instance.cpp @@ -77,11 +77,6 @@ void Instance::setExitHandler(void(*cb)(void *), void * opaque) libvlc_set_exit_handler(m_obj, cb, opaque); } -void Instance::wait() -{ - libvlc_wait(m_obj); -} - void Instance::setUserAgent(const std::string& name, const std::string& http) { libvlc_set_user_agent(m_obj, name.c_str(), http.c_str()); @@ -107,25 +102,6 @@ void Instance::logSetFile(FILE * stream) libvlc_log_set_file(m_obj, stream); } -unsigned Instance::logVerbosity() -{ - unsigned c_result = libvlc_get_log_verbosity(m_obj); - unsigned result = c_result; - return result; -} - -void Instance::setLogVerbosity(unsigned level) -{ - libvlc_set_log_verbosity(m_obj, level); -} - -libvlc_log_t * Instance::logOpen() -{ - libvlc_log_t * c_result = libvlc_log_open(m_obj); - libvlc_log_t * result = c_result; - return result; -} - std::list Instance::audioFilterList() { libvlc_module_description_t * c_result = libvlc_audio_filter_list_get(m_obj); diff --git a/libvlc_Instance.hpp b/libvlc_Instance.hpp index 267e496181f68be59391fe5b6e8ca175f7163227..c0edc17301c530e7db6367fe3a433e8d60de0d0e 100644 --- a/libvlc_Instance.hpp +++ b/libvlc_Instance.hpp @@ -112,15 +112,6 @@ public: */ void setExitHandler(void(*cb)(void *), void * opaque); - /** - * Waits until an interface causes the instance to exit. You should start - * at least one interface first, using Instance::addIntf() . - * - * \warning This function wastes one thread doing basically nothing. - * Instance::setExitHandler() should be used instead. - */ - void wait(); - /** * Sets the application name. LibVLC passes this as the user agent string * when a protocol requires it. @@ -189,30 +180,6 @@ public: */ void logSetFile(FILE * stream); - /** - * Always returns minus one. This function is only provided for backward - * compatibility. - * - * \return always -1 - */ - unsigned logVerbosity(); - - /** - * This function does nothing. It is only provided for backward - * compatibility. - * - * \param level ignored - */ - void setLogVerbosity(unsigned level); - - /** - * This function does nothing useful. It is only provided for backward - * compatibility. - * - * \return an unique pointer or NULL on error - */ - libvlc_log_t * logOpen(); - /** * Returns a list of audio filters that are available. * diff --git a/libvlc_Media.cpp b/libvlc_Media.cpp index bac9145b500f638ff22200232608432bca5f6c99..6fca6eb04986b2c443515d78356d9626207a0f54 100644 --- a/libvlc_Media.cpp +++ b/libvlc_Media.cpp @@ -96,19 +96,6 @@ Media::~Media() release(); } -std::vector Media::tracksInfo() { - libvlc_media_track_info_t* infos; - int num = libvlc_media_get_tracks_info(m_obj, &infos); - std::vector result; - result.reserve(num); - for (int i = 0; i < num; ++i) { - result.push_back(MediaTrackInfo(infos+i)); - } - libvlc_free(infos); - return result; -} - - void Media::addOption(const std::string& psz_options) { libvlc_media_add_option(m_obj, psz_options.c_str()); diff --git a/libvlc_Media.hpp b/libvlc_Media.hpp index 7f532a669b5906bb3e99d8c50f1baf9ddcc49ade..3811bc1e6a5892283f8797a8feee4ff94bfa3080 100644 --- a/libvlc_Media.hpp +++ b/libvlc_Media.hpp @@ -129,11 +129,6 @@ public: ~Media(); - /** - * Foo bar - */ - std::vector tracksInfo(); - /** * Add an option to the media. *