diff --git a/src/qt/qt_deviceconfig.cpp b/src/qt/qt_deviceconfig.cpp index 0cfe14a73..7218ab63c 100644 --- a/src/qt/qt_deviceconfig.cpp +++ b/src/qt/qt_deviceconfig.cpp @@ -11,7 +11,7 @@ extern "C" { #include <86box/86box.h> #include <86box/config.h> #include <86box/device.h> -#include <86box/plat_midi.h> +#include <86box/midi_rtmidi.h> } #include "qt_filefield.hpp" @@ -55,9 +55,9 @@ void DeviceConfig::ConfigureDevice(const _device_* device, int instance) { auto* model = cbox->model(); int currentIndex = -1; int selected = config_get_int(device_context.name, const_cast(config->name), config->default_int); - for (int i = 0; i < plat_midi_get_num_devs(); i++) { + for (int i = 0; i < rtmidi_get_num_devs(); i++) { char midiName[512] = { 0 }; - plat_midi_get_dev_name(i, midiName); + rtmidi_get_dev_name(i, midiName); Models::AddEntry(model, midiName, i); if (selected == i) { @@ -75,9 +75,9 @@ void DeviceConfig::ConfigureDevice(const _device_* device, int instance) { auto* model = cbox->model(); int currentIndex = -1; int selected = config_get_int(device_context.name, const_cast(config->name), config->default_int); - for (int i = 0; i < plat_midi_in_get_num_devs(); i++) { + for (int i = 0; i < rtmidi_in_get_num_devs(); i++) { char midiName[512] = { 0 }; - plat_midi_in_get_dev_name(i, midiName); + rtmidi_in_get_dev_name(i, midiName); Models::AddEntry(model, midiName, i); if (selected == i) { diff --git a/src/qt/qt_rendererstack.cpp b/src/qt/qt_rendererstack.cpp index afd52af5d..88d62e56b 100644 --- a/src/qt/qt_rendererstack.cpp +++ b/src/qt/qt_rendererstack.cpp @@ -25,8 +25,8 @@ RendererStack::RendererStack(QWidget *parent) : { ui->setupUi(this); imagebufs = QVector(2); - imagebufs[0] = QImage{QSize(2048 + 64, 2048 + 64), QImage::Format_RGB32}; - imagebufs[1] = QImage{QSize(2048 + 64, 2048 + 64), QImage::Format_RGB32}; + imagebufs[0] = QImage{QSize(2048, 2048), QImage::Format_RGB32}; + imagebufs[1] = QImage{QSize(2048, 2048), QImage::Format_RGB32}; #ifdef WAYLAND if (QApplication::platformName().contains("wayland")) { wl_init(); @@ -211,11 +211,11 @@ void RendererStack::blit(int x, int y, int w, int h) sw = this->w = w; sh = this->h = h; auto imagebits = imagebufs[currentBuf].bits(); - video_copy(imagebits + y * ((2048 + 64) * 4) + x * 4, &(buffer32->line[y][x]), h * (2048 + 64) * sizeof(uint32_t)); + video_copy(imagebits + y * (2048 * 4) + x * 4, &(buffer32->line[y][x]), h * 2048 * sizeof(uint32_t)); if (screenshots) { - video_screenshot((uint32_t *)imagebits, 0, 0, 2048 + 64); + video_screenshot((uint32_t *)imagebits, 0, 0, 2048); } video_blit_complete(); blitToRenderer(imagebufs[currentBuf], sx, sy, sw, sh);