Skip to content

Commit

Permalink
format
Browse files Browse the repository at this point in the history
  • Loading branch information
@univrsal
univrsal committed Mar 8, 2020
1 parent 7cebb66 commit cf5b479
Show file tree
Hide file tree
Showing 2 changed files with 110 additions and 110 deletions.
216 changes: 108 additions & 108 deletions src/query/vlc_obs_source.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,154 +23,154 @@
#include "../util/utility.hpp"
#include "../util/vlc_internal.h"

vlc_obs_source::vlc_obs_source() : music_source(S_SOURCE_VLC, T_SOURCE_VLC)
vlc_obs_source::vlc_obs_source()
: music_source(S_SOURCE_VLC, T_SOURCE_VLC)
{
m_capabilities = CAP_TITLE | CAP_ALBUM | CAP_PROGRESS | CAP_VOLUME_UP | CAP_VOLUME_DOWN | CAP_VOLUME_MUTE |
CAP_DURATION | CAP_PLAY_PAUSE | CAP_NEXT_SONG | CAP_PREV_SONG;
m_capabilities = CAP_TITLE | CAP_ALBUM | CAP_PROGRESS | CAP_VOLUME_UP | CAP_VOLUME_DOWN | CAP_VOLUME_MUTE | CAP_DURATION | CAP_PLAY_PAUSE | CAP_NEXT_SONG | CAP_PREV_SONG;

if (!util::vlc_loaded)
binfo("libVLC wasn't loaded, VLC support disabled");
if (!util::vlc_loaded)
binfo("libVLC wasn't loaded, VLC support disabled");
}

vlc_obs_source::~vlc_obs_source()
{
obs_weak_source_release(m_weak_src);
m_weak_src = nullptr;
obs_weak_source_release(m_weak_src);
m_weak_src = nullptr;
}

void vlc_obs_source::reload()
{
if (m_weak_src)
return;
load();
if (m_weak_src)
return;
load();
}

bool vlc_obs_source::enabled() const
{
return util::vlc_loaded;
return util::vlc_loaded;
}

void vlc_obs_source::load()
{
if (!util::vlc_loaded)
return;
CDEF_STR(CFG_VLC_ID, "");
m_target_source_name = CGET_STR(CFG_VLC_ID);
if (!util::vlc_loaded)
return;
CDEF_STR(CFG_VLC_ID, "");
m_target_source_name = CGET_STR(CFG_VLC_ID);

auto *src = obs_get_source_by_name(m_target_source_name);
auto* src = obs_get_source_by_name(m_target_source_name);

obs_weak_source_release(m_weak_src);
m_weak_src = nullptr;
obs_weak_source_release(m_weak_src);
m_weak_src = nullptr;

if (src) {
const auto *id = obs_source_get_id(src);
if (strcmp(id, "vlc_source") == 0) {
m_weak_src = obs_source_get_weak_source(src);
} else {
binfo("%s (%s) is not a valid vlc source", m_target_source_name, id);
}
obs_source_release(src);
}
if (src) {
const auto* id = obs_source_get_id(src);
if (strcmp(id, "vlc_source") == 0) {
m_weak_src = obs_source_get_weak_source(src);
} else {
binfo("%s (%s) is not a valid vlc source", m_target_source_name, id);
}
obs_source_release(src);
}
}

void vlc_obs_source::save()
{
if (!util::vlc_loaded)
return;
CSET_STR(CFG_VLC_ID, m_target_source_name);
if (!util::vlc_loaded)
return;
CSET_STR(CFG_VLC_ID, m_target_source_name);
}

struct vlc_source *vlc_obs_source::get_vlc()
struct vlc_source* vlc_obs_source::get_vlc()
{
struct vlc_source *data = nullptr;
obs_source_t *src = nullptr;
if (!m_weak_src || !util::vlc_loaded)
return data;
struct vlc_source* data = nullptr;
obs_source_t* src = nullptr;
if (!m_weak_src || !util::vlc_loaded)
return data;

src = obs_weak_source_get_source(m_weak_src);
if (src) {
void *private_data = obs_obj_get_data(src);
if (private_data)
data = reinterpret_cast<struct vlc_source *>(private_data);
} else if (m_weak_src) { /* The actual source is gone -> clear the weak source */
obs_weak_source_release(m_weak_src);
m_weak_src = nullptr;
load();
}
src = obs_weak_source_get_source(m_weak_src);
if (src) {
void* private_data = obs_obj_get_data(src);
if (private_data)
data = reinterpret_cast<struct vlc_source*>(private_data);
} else if (m_weak_src) { /* The actual source is gone -> clear the weak source */
obs_weak_source_release(m_weak_src);
m_weak_src = nullptr;
load();
}

obs_source_release(src);
return data;
obs_source_release(src);
return data;
}

void vlc_obs_source::refresh()
{

if (!util::vlc_loaded)
return;
if (!util::vlc_loaded)
return;

reload();
auto *vlc = get_vlc();
reload();
auto* vlc = get_vlc();

if (vlc) {
/* Locking source mutex (vlc->mutex) here
if (vlc) {
/* Locking source mutex (vlc->mutex) here
* seems to cause a crash
**/
m_current.clear();
m_current.set_progress(libvlc_media_player_get_time_(vlc->media_player));
m_current.set_duration(libvlc_media_player_get_length_(vlc->media_player));
m_current.set_playing(libvlc_media_player_get_state_(vlc->media_player) == libvlc_Playing);

auto *media = libvlc_media_player_get_media_(vlc->media_player);
if (media) {
const char *title = libvlc_media_get_meta_(media, libvlc_meta_Title);
const char *artists = libvlc_media_get_meta_(media, libvlc_meta_Artist);
const char *year = libvlc_media_get_meta_(media, libvlc_meta_Date);
const char *album = libvlc_media_get_meta_(media, libvlc_meta_Album);
const char *num = libvlc_media_get_meta_(media, libvlc_meta_TrackID);
const char *disc = libvlc_media_get_meta_(media, libvlc_meta_DiscNumber);
const char *cover = libvlc_media_get_meta_(media, libvlc_meta_ArtworkURL);

if (title)
m_current.set_title(title);
if (cover)
m_current.set_cover_link(cover);
if (artists)
m_current.append_artist(artists);
if (year)
m_current.set_year(year);
if (album)
m_current.set_album(album);
if (num)
m_current.set_track_number(std::stoi(num));

if (disc)
m_current.set_disc_number(std::stoi(disc));

util::download_cover(m_current);
}
} else {
m_current.clear();
}
m_current.clear();
m_current.set_progress(libvlc_media_player_get_time_(vlc->media_player));
m_current.set_duration(libvlc_media_player_get_length_(vlc->media_player));
m_current.set_playing(libvlc_media_player_get_state_(vlc->media_player) == libvlc_Playing);

auto* media = libvlc_media_player_get_media_(vlc->media_player);
if (media) {
const char* title = libvlc_media_get_meta_(media, libvlc_meta_Title);
const char* artists = libvlc_media_get_meta_(media, libvlc_meta_Artist);
const char* year = libvlc_media_get_meta_(media, libvlc_meta_Date);
const char* album = libvlc_media_get_meta_(media, libvlc_meta_Album);
const char* num = libvlc_media_get_meta_(media, libvlc_meta_TrackID);
const char* disc = libvlc_media_get_meta_(media, libvlc_meta_DiscNumber);
const char* cover = libvlc_media_get_meta_(media, libvlc_meta_ArtworkURL);

if (title)
m_current.set_title(title);
if (cover)
m_current.set_cover_link(cover);
if (artists)
m_current.append_artist(artists);
if (year)
m_current.set_year(year);
if (album)
m_current.set_album(album);
if (num)
m_current.set_track_number(std::stoi(num));

if (disc)
m_current.set_disc_number(std::stoi(disc));

util::download_cover(m_current);
}
} else {
m_current.clear();
}
}

bool vlc_obs_source::execute_capability(capability c)
{
/* vlc source already has hotkeys in obs */
UNUSED_PARAMETER(c);
return true;
/* vlc source already has hotkeys in obs */
UNUSED_PARAMETER(c);
return true;
}

void vlc_obs_source::set_gui_values()
{
m_target_source_name = CGET_STR(CFG_VLC_ID);
if (m_target_source_name)
emit tuna_dialog->vlc_source_selected(utf8_to_qt(m_target_source_name));
m_target_source_name = CGET_STR(CFG_VLC_ID);
if (m_target_source_name)
emit tuna_dialog->vlc_source_selected(utf8_to_qt(m_target_source_name));
}

bool vlc_obs_source::valid_format(const QString &str)
bool vlc_obs_source::valid_format(const QString& str)
{
UNUSED_PARAMETER(str);
return true;
UNUSED_PARAMETER(str);
return true;
}
#else
vlc_obs_source::vlc_obs_source() {}
Expand All @@ -182,28 +182,28 @@ void vlc_obs_source::refresh() {}
void vlc_obs_source::set_gui_values() {}
bool vlc_obs_source::execute_capability(capability c)
{
return true;
return true;
}
bool vlc_obs_source::valid_format(const QString &str)
bool vlc_obs_source::valid_format(const QString& str)
{
return true;
return true;
}
struct vlc_source *vlc_obs_source::get_vlc()
struct vlc_source* vlc_obs_source::get_vlc()
{
return nullptr;
return nullptr;
}
bool vlc_obs_source::enabled() const
{
return false;
return false;
}

const char *vlc_obs_source::name() const
const char* vlc_obs_source::name() const
{
return T_SOURCE_VLC;
return T_SOURCE_VLC;
}

const char *vlc_obs_source::id() const
const char* vlc_obs_source::id() const
{
return S_SOURCE_VLC;
return S_SOURCE_VLC;
}
#endif
4 changes: 2 additions & 2 deletions src/util/tuna_thread.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ bool start()
result = pthread_create(&thread_handle, nullptr, thread_method, nullptr) == 0;
#endif
thread_flag = result;
thread_running = result;
thread_running = result;
return result;
}

Expand Down Expand Up @@ -105,7 +105,7 @@ void* thread_method(void* arg)
const auto wait = config::refresh_rate - delta;
os_sleep_ms(wait);
}
thread_running = false;
thread_running = false;
#ifdef _WIN32
return 0;
#else
Expand Down

0 comments on commit cf5b479

Please sign in to comment.