80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

fixups after latest merge: plat_midi_ => rtmidi_, framebuffer is now 2048x2048

Browse Source
This commit is contained in:
Joakim L. Gilje
2021-12-17 11:10:32 +01:00
parent d548dd7e52
commit c3c5a87a70
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/qt/qt_deviceconfig.cpp
View File

@@ -11,7 +11,7 @@ extern "C" {
#include <86box/86box.h> #include <86box/86box.h>
#include <86box/config.h> #include <86box/config.h>
#include <86box/device.h> #include <86box/device.h>
#include <86box/plat_midi.h> #include <86box/midi_rtmidi.h>
} }
#include "qt_filefield.hpp" #include "qt_filefield.hpp"
@@ -55,9 +55,9 @@ void DeviceConfig::ConfigureDevice(const _device_* device, int instance) {
auto* model = cbox->model(); auto* model = cbox->model();
int currentIndex = -1; int currentIndex = -1;
int selected = config_get_int(device_context.name, const_cast<char*>(config->name), config->default_int); int selected = config_get_int(device_context.name, const_cast<char*>(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 }; char midiName[512] = { 0 };
plat_midi_get_dev_name(i, midiName); rtmidi_get_dev_name(i, midiName);
Models::AddEntry(model, midiName, i); Models::AddEntry(model, midiName, i);
if (selected == i) { if (selected == i) {
@@ -75,9 +75,9 @@ void DeviceConfig::ConfigureDevice(const _device_* device, int instance) {
auto* model = cbox->model(); auto* model = cbox->model();
int currentIndex = -1; int currentIndex = -1;
int selected = config_get_int(device_context.name, const_cast<char*>(config->name), config->default_int); int selected = config_get_int(device_context.name, const_cast<char*>(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 }; char midiName[512] = { 0 };
plat_midi_in_get_dev_name(i, midiName); rtmidi_in_get_dev_name(i, midiName);
Models::AddEntry(model, midiName, i); Models::AddEntry(model, midiName, i);
if (selected == i) { if (selected == i) {

8
src/qt/qt_rendererstack.cpp
View File

@@ -25,8 +25,8 @@ RendererStack::RendererStack(QWidget *parent) :
{ {
ui->setupUi(this); ui->setupUi(this);
imagebufs = QVector<QImage>(2); imagebufs = QVector<QImage>(2);
imagebufs[0] = QImage{QSize(2048 + 64, 2048 + 64), QImage::Format_RGB32}; imagebufs[0] = QImage{QSize(2048, 2048), QImage::Format_RGB32};
imagebufs[1] = QImage{QSize(2048 + 64, 2048 + 64), QImage::Format_RGB32}; imagebufs[1] = QImage{QSize(2048, 2048), QImage::Format_RGB32};
#ifdef WAYLAND #ifdef WAYLAND
if (QApplication::platformName().contains("wayland")) { if (QApplication::platformName().contains("wayland")) {
wl_init(); wl_init();
@@ -211,11 +211,11 @@ void RendererStack::blit(int x, int y, int w, int h)
sw = this->w = w; sw = this->w = w;
sh = this->h = h; sh = this->h = h;
auto imagebits = imagebufs[currentBuf].bits(); 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) if (screenshots)
{ {
video_screenshot((uint32_t *)imagebits, 0, 0, 2048 + 64); video_screenshot((uint32_t *)imagebits, 0, 0, 2048);
} }
video_blit_complete(); video_blit_complete();
blitToRenderer(imagebufs[currentBuf], sx, sy, sw, sh); blitToRenderer(imagebufs[currentBuf], sx, sy, sw, sh);