diff --git a/src/osd/modules/monitor/monitor_retro.cpp b/src/osd/modules/monitor/monitor_retro.cpp index da880532..4b35d7ac 100644 --- a/src/osd/modules/monitor/monitor_retro.cpp +++ b/src/osd/modules/monitor/monitor_retro.cpp @@ -2,12 +2,12 @@ * monitor_retro.cpp * */ -#include "emu.h" #include "modules/osdmodule.h" #include "monitor_module.h" #include "modules/osdwindow.h" #include "monitor_common.h" +#include "osdcore.h" #include "libretro/libretro-internal/libretro_shared.h" @@ -27,16 +27,10 @@ public: private: void refresh() override { - m_pos_size = osd_rect(0,0, fb_width, fb_height); m_usuable_pos_size = osd_rect(0,0, fb_width, fb_height); m_is_primary = (oshandle() == 0); - - if(alternate_renderer==false) - set_aspect(retro_aspect); - //printf("refreshmonitor (%d x %d) a:%f\n", fb_width, fb_height,retro_aspect); } - }; //============================================================ @@ -88,52 +82,29 @@ public: protected: int init_internal(const osd_options& options) override { - // make a list of monitors + int i; + + for (i = 0; i < 1; i++) { - int i; + char temp[64]; + snprintf(temp, sizeof(temp) - 1, "%s%d", OSDOPTION_SCREEN, i); - osd_printf_verbose("Enter init_monitors\n"); + // allocate a new monitor info + std::shared_ptr monitor = std::make_shared(*this, i, temp, 1.0f); - for (i = 0; i < 1; i++) - { - char temp[64]; - snprintf(temp, sizeof(temp) - 1, "%s%d", OSDOPTION_SCREEN, i); + // guess the aspect ratio assuming square pixels + monitor->set_aspect(static_cast(monitor->position_size().width()) / static_cast(monitor->position_size().height())); - // allocate a new monitor info - std::shared_ptr monitor = std::make_shared(*this, i, temp, 1.0f); - - osd_printf_verbose("Adding monitor %s (%d x %d)\n", monitor->devicename().c_str(), - monitor->position_size().width(), monitor->position_size().height()); - - // guess the aspect ratio assuming square pixels - monitor->set_aspect(static_cast(monitor->position_size().width()) / static_cast(monitor->position_size().height())); -printf("Adding monitor %s (%d x %d) a:%f\n", monitor->devicename().c_str(), - monitor->position_size().width(), monitor->position_size().height(),(float)monitor->position_size().width()/(float) monitor->position_size().height()); - - // hook us into the list - add_monitor(monitor); - } + // hook us into the list + add_monitor(monitor); } - osd_printf_verbose("Leave init_monitors\n"); return 0; } private: -/* - sdl.h = osd.height(); - sdl.w = osd.width(); - sdl.x = osd.left(); - sdl.y = osd.top(); - -*/ static int compute_intersection(const osd_rect &rect1, const osd_rect &rect2) { -/* - SDL_Rect intersection; - if (SDL_IntersectRect(&sdl1, &sdl2, &intersection)) - return intersection.w + intersection.h; -*/ return 0; } };