claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'qt' of https://github.com/jgilje/86Box into qt

Browse Source
This commit is contained in:
ts-korhonen
2021-12-17 16:23:59 +02:00
parent e686a0ad87 c3c5a87a70
commit 265abedb3b
25 changed files with 360 additions and 629 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/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<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 };
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<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 };
plat_midi_in_get_dev_name(i, midiName);
rtmidi_in_get_dev_name(i, midiName);
Models::AddEntry(model, midiName, i);
if (selected == i) {

2
src/qt/qt_rendererstack.cpp
View File

@@ -220,7 +220,7 @@ 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) * 4) + x * 4, &(buffer32->line[y][x]), h * (2048) * sizeof(uint32_t));
video_copy(imagebits + y * (2048 * 4) + x * 4, &(buffer32->line[y][x]), h * 2048 * sizeof(uint32_t));
if (screenshots)
{