diff --git a/deps/dr/dr_flac.h b/deps/dr/dr_flac.h index dddba62b83..fac749daff 100644 --- a/deps/dr/dr_flac.h +++ b/deps/dr/dr_flac.h @@ -4081,7 +4081,6 @@ static drflac_bool32 drflac__on_seek_ogg(void* pUserData, int offset, drflac_see if (oggbs->bytesRemainingInPage >= (size_t)bytesRemainingToSeek) { - bytesSeeked += bytesRemainingToSeek; oggbs->bytesRemainingInPage -= bytesRemainingToSeek; break; } @@ -4117,7 +4116,6 @@ drflac_bool32 drflac_ogg__seek_to_sample(drflac* pFlac, drflac_uint64 sampleInde return DRFLAC_FALSE; oggbs->bytesRemainingInPage = 0; - runningFrameBytePos = oggbs->currentBytePos; /* <-- Points to the OggS identifier. */ for (;;) { if (!drflac_oggbs__goto_next_page(oggbs, drflac_ogg_recover_on_crc_mismatch)) { diff --git a/frontend/frontend.c b/frontend/frontend.c index 8dd0b71693..b144761490 100644 --- a/frontend/frontend.c +++ b/frontend/frontend.c @@ -105,7 +105,7 @@ void main_exit(void *args) int rarch_main(int argc, char *argv[], void *data) { void *args = (void*)data; -#ifdef HAVE_MAIN +#if defined(HAVE_MAIN) && defined(HAVE_QT) const ui_application_t *ui_application = NULL; #endif @@ -134,7 +134,7 @@ int rarch_main(int argc, char *argv[], void *data) ui_companion_driver_init_first(); -#ifndef HAVE_MAIN +#if !defined(HAVE_MAIN) do { unsigned sleep_ms = 0; @@ -150,7 +150,7 @@ int rarch_main(int argc, char *argv[], void *data) }while(1); main_exit(args); -#elif HAVE_QT +#elif defined(HAVE_QT) ui_application = ui_companion_driver_get_qt_application_ptr(); if (ui_application && ui_application->run) diff --git a/ui/ui_companion_driver.c b/ui/ui_companion_driver.c index 802fa06ffe..78728d5f2f 100644 --- a/ui/ui_companion_driver.c +++ b/ui/ui_companion_driver.c @@ -152,8 +152,10 @@ void ui_companion_driver_init_first(void) void ui_companion_driver_toggle(bool force) { +#ifdef HAVE_QT settings_t *settings = config_get_ptr(); - +#endif + if (ui_companion && ui_companion->toggle) ui_companion->toggle(ui_companion_data, false); @@ -175,7 +177,6 @@ void ui_companion_driver_toggle(bool force) void ui_companion_driver_notify_refresh(void) { const ui_companion_driver_t *ui = ui_companion_get_ptr(); - settings_t *settings = config_get_ptr(); if (!ui) return; @@ -253,7 +254,9 @@ const ui_application_t *ui_companion_driver_get_application_ptr(void) void ui_companion_driver_msg_queue_push(const char *msg, unsigned priority, unsigned duration, bool flush) { const ui_companion_driver_t *ui = ui_companion_get_ptr(); +#ifdef HAVE_QT settings_t *settings = config_get_ptr(); +#endif if (ui && ui->msg_queue_push) ui->msg_queue_push(ui_companion_data, msg, priority, duration, flush);