From 63f9a01f8c5d43b9cfe68c2d401a84647d19c10e Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Wed, 29 Jun 2016 08:34:30 +0200 Subject: Cleanup and version bump --- src/osd/modules/debugger/debugimgui.cpp | 10 ++--- src/osd/modules/diagnostics/diagnostics_win32.cpp | 2 +- src/osd/modules/file/posixdir.cpp | 10 ++--- src/osd/modules/file/windir.cpp | 2 +- src/osd/modules/font/font_dwrite.cpp | 2 +- src/osd/modules/input/input_sdl.cpp | 2 +- src/osd/modules/input/input_windows.cpp | 4 +- src/osd/modules/input/input_xinput.cpp | 2 +- src/osd/modules/lib/osdlib.h | 1 - src/osd/modules/lib/osdlib_macosx.cpp | 5 +-- src/osd/modules/lib/osdlib_unix.cpp | 5 +-- src/osd/modules/lib/osdlib_win32.cpp | 5 +-- src/osd/modules/netdev/pcap.cpp | 2 +- src/osd/modules/output/output_module.h | 2 +- src/osd/modules/render/bgfx/chain.cpp | 50 +++++++++++------------ src/osd/modules/render/bgfx/chain.h | 6 +-- src/osd/modules/render/bgfx/chainmanager.cpp | 46 ++++++++++----------- src/osd/modules/render/bgfx/targetmanager.cpp | 4 +- src/osd/modules/render/d3d/d3dhlsl.cpp | 2 +- src/osd/modules/render/drawd3d.cpp | 22 +++++----- src/osd/modules/render/winglcontext.h | 2 +- src/osd/modules/sound/xaudio2_sound.cpp | 4 +- 22 files changed, 93 insertions(+), 97 deletions(-) (limited to 'src/osd/modules') diff --git a/src/osd/modules/debugger/debugimgui.cpp b/src/osd/modules/debugger/debugimgui.cpp index b4cead4938c..0c4f16919f9 100644 --- a/src/osd/modules/debugger/debugimgui.cpp +++ b/src/osd/modules/debugger/debugimgui.cpp @@ -504,7 +504,7 @@ int debug_imgui::history_set(ImGuiTextEditCallbackData* data) data->CursorPos = data->BufTextLen = (int)snprintf(data->Buf, (size_t)data->BufSize, "%s", ""); else data->CursorPos = data->BufTextLen = (int)snprintf(data->Buf, (size_t)data->BufSize, "%s", view_main_console->console_history[history_pos].c_str()); - + data->BufDirty = true; return 0; } @@ -613,7 +613,7 @@ void debug_imgui::draw_view(debug_area* view_ptr, bool exp_change) drawlist->AddRect(ImVec2(view_ptr->ofs_x,view_ptr->ofs_y + ImGui::GetScrollY()), ImVec2(view_ptr->ofs_x + view_ptr->view_width,view_ptr->ofs_y + ImGui::GetScrollY() + view_ptr->view_height),col); } - + // if the vertical scroll bar is at the end, then force it to the maximum value in case of an update if(view_ptr->scroll_end) ImGui::SetScrollY(ImGui::GetScrollMaxY()); @@ -622,7 +622,7 @@ void debug_imgui::draw_view(debug_area* view_ptr, bool exp_change) if(view_ptr->scroll_follow) if(ImGui::GetScrollY() == ImGui::GetScrollMaxY() || ImGui::GetScrollMaxY() < 0) view_ptr->scroll_end = true; - + ImGui::PopStyleVar(2); } @@ -882,7 +882,7 @@ void debug_imgui::draw_memory(debug_area* view_ptr, bool* opened) ImGui::End(); } else - view_ptr->is_collapsed = true; + view_ptr->is_collapsed = true; } void debug_imgui::add_memory(int id) @@ -1002,7 +1002,7 @@ void debug_imgui::draw_console() draw_view(view_main_console,false); ImGui::EndChild(); ImGui::Separator(); - + ImGuiInputTextFlags flags = ImGuiInputTextFlags_EnterReturnsTrue | ImGuiInputTextFlags_CallbackHistory; if(m_running) flags |= ImGuiInputTextFlags_ReadOnly; diff --git a/src/osd/modules/diagnostics/diagnostics_win32.cpp b/src/osd/modules/diagnostics/diagnostics_win32.cpp index 70e290240c2..60707f2baad 100644 --- a/src/osd/modules/diagnostics/diagnostics_win32.cpp +++ b/src/osd/modules/diagnostics/diagnostics_win32.cpp @@ -185,7 +185,7 @@ stack_walker::stack_walker() m_sym_function_table_access_64 = m_dbghelp_dll->bind("SymFunctionTableAccess64"); m_sym_get_module_base_64 = m_dbghelp_dll->bind("SymGetModuleBase64"); m_rtl_capture_context = m_kernel32_dll->bind("RtlCaptureContext"); - + // initialize the symbols if (!s_initialized && m_sym_initialize && m_stack_walk_64 && m_sym_function_table_access_64 && m_sym_get_module_base_64) { diff --git a/src/osd/modules/file/posixdir.cpp b/src/osd/modules/file/posixdir.cpp index 161ea62c404..ea3218584d7 100644 --- a/src/osd/modules/file/posixdir.cpp +++ b/src/osd/modules/file/posixdir.cpp @@ -99,12 +99,12 @@ public: bool open_impl(std::string const &dirname); private: - typedef std::unique_ptr dir_ptr; + typedef std::unique_ptr dir_ptr; - entry m_entry; - sdl_dirent *m_data; - dir_ptr m_fd; - std::string m_path; + entry m_entry; + sdl_dirent *m_data; + dir_ptr m_fd; + std::string m_path; }; diff --git a/src/osd/modules/file/windir.cpp b/src/osd/modules/file/windir.cpp index ad463f2d337..3ecd2412910 100644 --- a/src/osd/modules/file/windir.cpp +++ b/src/osd/modules/file/windir.cpp @@ -45,7 +45,7 @@ public: private: HANDLE m_find; // handle to the finder bool m_is_first; // true if this is the first entry - entry m_entry; // current entry's data + entry m_entry; // current entry's data WIN32_FIND_DATA m_data; // current raw data }; diff --git a/src/osd/modules/font/font_dwrite.cpp b/src/osd/modules/font/font_dwrite.cpp index 599a562de2b..725c8b9bc81 100644 --- a/src/osd/modules/font/font_dwrite.cpp +++ b/src/osd/modules/font/font_dwrite.cpp @@ -149,7 +149,7 @@ HRESULT SaveBitmap(IWICBitmap* bitmap, GUID pixelFormat, const WCHAR *filename) HR_RETHR(frameEncode->Commit()); HR_RETHR(encoder->Commit()); - + return S_OK; } diff --git a/src/osd/modules/input/input_sdl.cpp b/src/osd/modules/input/input_sdl.cpp index a60746ca3fa..f0bd112116f 100644 --- a/src/osd/modules/input/input_sdl.cpp +++ b/src/osd/modules/input/input_sdl.cpp @@ -513,7 +513,7 @@ public: sdl_input_module::input_init(machine); static int event_types[] = { - static_cast(SDL_KEYDOWN), + static_cast(SDL_KEYDOWN), static_cast(SDL_KEYUP), static_cast(SDL_TEXTINPUT) }; diff --git a/src/osd/modules/input/input_windows.cpp b/src/osd/modules/input/input_windows.cpp index 4455a77c991..88a82b8b877 100644 --- a/src/osd/modules/input/input_windows.cpp +++ b/src/osd/modules/input/input_windows.cpp @@ -24,10 +24,10 @@ bool windows_osd_interface::should_hide_mouse() const { bool hidemouse = false; wininput_module* mod; - + mod = dynamic_cast(m_keyboard_input); if (mod) hidemouse |= mod->should_hide_mouse(); - + mod = dynamic_cast(m_mouse_input); if (mod) hidemouse |= mod->should_hide_mouse(); diff --git a/src/osd/modules/input/input_xinput.cpp b/src/osd/modules/input/input_xinput.cpp index 2d01b702bd8..d1dcfd8b023 100644 --- a/src/osd/modules/input/input_xinput.cpp +++ b/src/osd/modules/input/input_xinput.cpp @@ -44,7 +44,7 @@ int xinput_api_helper::initialize() XInputGetState = m_xinput_dll->bind("XInputGetState"); XInputGetCapabilities = m_xinput_dll->bind("XInputGetCapabilities"); - + if (!XInputGetState || !XInputGetCapabilities) { osd_printf_verbose("Could not find XInput. Please try to reinstall DirectX runtime package.\n"); diff --git a/src/osd/modules/lib/osdlib.h b/src/osd/modules/lib/osdlib.h index 64bd556cd3c..17f341b8934 100644 --- a/src/osd/modules/lib/osdlib.h +++ b/src/osd/modules/lib/osdlib.h @@ -78,7 +78,6 @@ char *osd_get_clipboard_text(void); -----------------------------------------------------------------------------*/ namespace osd { - class dynamic_module { public: diff --git a/src/osd/modules/lib/osdlib_macosx.cpp b/src/osd/modules/lib/osdlib_macosx.cpp index b3a7ed642e3..770078a254f 100644 --- a/src/osd/modules/lib/osdlib_macosx.cpp +++ b/src/osd/modules/lib/osdlib_macosx.cpp @@ -227,7 +227,6 @@ char *osd_get_clipboard_text(void) //============================================================ namespace osd { - class dynamic_module_posix_impl : public dynamic_module { public: @@ -265,7 +264,7 @@ protected: if (function != nullptr) { - m_module = module; + m_module = module; return function; } else @@ -274,7 +273,7 @@ protected: } } } - + return nullptr; } diff --git a/src/osd/modules/lib/osdlib_unix.cpp b/src/osd/modules/lib/osdlib_unix.cpp index 81d9967ff64..3f3bbb00269 100644 --- a/src/osd/modules/lib/osdlib_unix.cpp +++ b/src/osd/modules/lib/osdlib_unix.cpp @@ -172,7 +172,6 @@ char *osd_get_clipboard_text(void) //============================================================ namespace osd { - class dynamic_module_posix_impl : public dynamic_module { public: @@ -210,7 +209,7 @@ protected: if (function != nullptr) { - m_module = module; + m_module = module; return function; } else @@ -219,7 +218,7 @@ protected: } } } - + return nullptr; } diff --git a/src/osd/modules/lib/osdlib_win32.cpp b/src/osd/modules/lib/osdlib_win32.cpp index e65509cc436..06a979a7a77 100644 --- a/src/osd/modules/lib/osdlib_win32.cpp +++ b/src/osd/modules/lib/osdlib_win32.cpp @@ -330,7 +330,6 @@ char *osd_get_clipboard_text(void) #endif namespace osd { - class dynamic_module_win32_impl : public dynamic_module { public: @@ -374,7 +373,7 @@ protected: if (function != nullptr) { - m_module = module; + m_module = module; return function; } else @@ -383,7 +382,7 @@ protected: } } } - + return nullptr; } diff --git a/src/osd/modules/netdev/pcap.cpp b/src/osd/modules/netdev/pcap.cpp index 91ff840473b..f5e01d8ea98 100644 --- a/src/osd/modules/netdev/pcap.cpp +++ b/src/osd/modules/netdev/pcap.cpp @@ -13,7 +13,7 @@ #define WIN32_LEAN_AND_MEAN #include #undef interface -#define LIB_NAME "wpcap.dll" +#define LIB_NAME "wpcap.dll" #elif defined(SDLMAME_MACOSX) #include diff --git a/src/osd/modules/output/output_module.h b/src/osd/modules/output/output_module.h index f3461d3e1f6..83b9a464f07 100644 --- a/src/osd/modules/output/output_module.h +++ b/src/osd/modules/output/output_module.h @@ -25,7 +25,7 @@ public: virtual ~output_module() { } virtual void notify(const char *outname, INT32 value) = 0; - + void set_machine(running_machine *machine) { m_machine = machine; }; running_machine &machine() const { return *m_machine; } private: diff --git a/src/osd/modules/render/bgfx/chain.cpp b/src/osd/modules/render/bgfx/chain.cpp index 4ba069d18a4..5806c3ce042 100644 --- a/src/osd/modules/render/bgfx/chain.cpp +++ b/src/osd/modules/render/bgfx/chain.cpp @@ -34,11 +34,11 @@ bgfx_chain::bgfx_chain(std::string name, std::string author, bool transform, tar , m_current_time(0) , m_screen_index(screen_index) { - for (bgfx_target* target : m_target_list) - { - m_target_map[target->name()] = target; - m_target_names.push_back(target->name()); - } + for (bgfx_target* target : m_target_list) + { + m_target_map[target->name()] = target; + m_target_names.push_back(target->name()); + } } bgfx_chain::~bgfx_chain() @@ -63,13 +63,13 @@ bgfx_chain::~bgfx_chain() void bgfx_chain::repopulate_targets() { - for (size_t i = 0; i < m_target_names.size(); i++) - { - bgfx_target* target = m_targets.target(m_screen_index, m_target_names[i]); - if (target != nullptr) { - m_target_list[i] = target; - } - } + for (size_t i = 0; i < m_target_names.size(); i++) + { + bgfx_target* target = m_targets.target(m_screen_index, m_target_names[i]); + if (target != nullptr) { + m_target_list[i] = target; + } + } } void bgfx_chain::process(render_primitive* prim, int view, int screen, texture_manager& textures, osd_window& window, uint64_t blend) @@ -87,19 +87,19 @@ void bgfx_chain::process(render_primitive* prim, int view, int screen, texture_m bool orientation_swap_xy = (window.machine().system().flags & ORIENTATION_SWAP_XY) == ORIENTATION_SWAP_XY; bool rotation_swap_xy = (window.target()->orientation() & ORIENTATION_SWAP_XY) == ORIENTATION_SWAP_XY; bool swap_xy = orientation_swap_xy ^ rotation_swap_xy; - - float screen_scale_x = 1.0f; - float screen_scale_y = 1.0f; - float screen_offset_x = 0.0f; - float screen_offset_y = 0.0f; - if (screen_device != nullptr) - { - render_container &screen_container = screen_device->container(); - screen_scale_x = 1.0f / screen_container.xscale(); - screen_scale_y = 1.0f / screen_container.yscale(); - screen_offset_x = -screen_container.xoffset(); - screen_offset_y = -screen_container.yoffset(); - } + + float screen_scale_x = 1.0f; + float screen_scale_y = 1.0f; + float screen_offset_x = 0.0f; + float screen_offset_y = 0.0f; + if (screen_device != nullptr) + { + render_container &screen_container = screen_device->container(); + screen_scale_x = 1.0f / screen_container.xscale(); + screen_scale_y = 1.0f / screen_container.yscale(); + screen_offset_x = -screen_container.xoffset(); + screen_offset_y = -screen_container.yoffset(); + } for (bgfx_chain_entry* entry : m_entries) { diff --git a/src/osd/modules/render/bgfx/chain.h b/src/osd/modules/render/bgfx/chain.h index bddec2c9bc3..157f92173cf 100644 --- a/src/osd/modules/render/bgfx/chain.h +++ b/src/osd/modules/render/bgfx/chain.h @@ -32,7 +32,7 @@ public: ~bgfx_chain(); void process(render_primitive* prim, int view, int screen, texture_manager& textures, osd_window &window, uint64_t blend = 0L); - void repopulate_targets(); + void repopulate_targets(); // Getters std::vector& sliders() { return m_sliders; } @@ -49,8 +49,8 @@ private: std::vector m_params; std::vector m_entries; std::vector m_target_list; - std::vector m_target_names; - std::map m_target_map; + std::vector m_target_names; + std::map m_target_map; int64_t m_current_time; uint32_t m_screen_index; }; diff --git a/src/osd/modules/render/bgfx/chainmanager.cpp b/src/osd/modules/render/bgfx/chainmanager.cpp index d4c59f9bb6a..2116322f19a 100644 --- a/src/osd/modules/render/bgfx/chainmanager.cpp +++ b/src/osd/modules/render/bgfx/chainmanager.cpp @@ -293,17 +293,17 @@ void chain_manager::process_screen_quad(uint32_t view, uint32_t screen, render_p bgfx_texture *texture = new bgfx_texture(full_name, bgfx::TextureFormat::RGBA8, tex_width, tex_height, mem, BGFX_TEXTURE_U_CLAMP | BGFX_TEXTURE_V_CLAMP | BGFX_TEXTURE_MIN_POINT | BGFX_TEXTURE_MAG_POINT | BGFX_TEXTURE_MIP_POINT); m_textures.add_provider(full_name, texture); - const bool any_targets_rebuilt = m_targets.update_target_sizes(screen, tex_width, tex_height, TARGET_STYLE_GUEST); + const bool any_targets_rebuilt = m_targets.update_target_sizes(screen, tex_width, tex_height, TARGET_STYLE_GUEST); if (any_targets_rebuilt) - { - for (bgfx_chain* chain : m_screen_chains) - { - if (chain != nullptr) - { - chain->repopulate_targets(); - } - } - } + { + for (bgfx_chain* chain : m_screen_chains) + { + if (chain != nullptr) + { + chain->repopulate_targets(); + } + } + } bgfx_chain* chain = screen_chain(screen); chain->process(prim, view, screen, m_textures, window, bgfx_util::get_blend_state(PRIMFLAG_GET_BLENDMODE(prim->flags))); @@ -441,19 +441,19 @@ uint32_t chain_manager::handle_screen_chains(uint32_t view, render_primitive *st std::swap(screen_width, screen_height); } - const bool any_targets_rebuilt = m_targets.update_target_sizes(screen_index, screen_width, screen_height, TARGET_STYLE_NATIVE); - if (any_targets_rebuilt) - { - for (bgfx_chain* chain : m_screen_chains) - { - if (chain != nullptr) - { - chain->repopulate_targets(); - } - } - } - - process_screen_quad(view + used_views, screen_index, prim, window); + const bool any_targets_rebuilt = m_targets.update_target_sizes(screen_index, screen_width, screen_height, TARGET_STYLE_NATIVE); + if (any_targets_rebuilt) + { + for (bgfx_chain* chain : m_screen_chains) + { + if (chain != nullptr) + { + chain->repopulate_targets(); + } + } + } + + process_screen_quad(view + used_views, screen_index, prim, window); used_views += screen_chain(screen_index)->applicable_passes(); screen_index++; diff --git a/src/osd/modules/render/bgfx/targetmanager.cpp b/src/osd/modules/render/bgfx/targetmanager.cpp index 7e8577b95b3..dfc1678ee34 100644 --- a/src/osd/modules/render/bgfx/targetmanager.cpp +++ b/src/osd/modules/render/bgfx/targetmanager.cpp @@ -102,10 +102,10 @@ bool target_manager::update_target_sizes(uint32_t screen, uint16_t width, uint16 { sizes[screen] = osd_dim(width, height); rebuild_targets(screen, style); - return true; + return true; } - return false; + return false; } void target_manager::rebuild_targets(uint32_t screen, uint32_t style) diff --git a/src/osd/modules/render/d3d/d3dhlsl.cpp b/src/osd/modules/render/d3d/d3dhlsl.cpp index feb88dc0add..38f23bb2afc 100644 --- a/src/osd/modules/render/d3d/d3dhlsl.cpp +++ b/src/osd/modules/render/d3d/d3dhlsl.cpp @@ -47,7 +47,7 @@ shaders::shaders() : shadow_texture(nullptr), options(nullptr), avi_output_file(nullptr), avi_frame(0), avi_copy_surface(nullptr), avi_copy_texture(nullptr), avi_final_target(nullptr), avi_final_texture(nullptr), black_surface(nullptr), black_texture(nullptr), render_snap(false), snap_rendered(false), snap_copy_target(nullptr), snap_copy_texture(nullptr), snap_target(nullptr), snap_texture(nullptr), snap_width(0), snap_height(0), lines_pending(false), initialized(false), backbuffer(nullptr), curr_effect(nullptr), default_effect(nullptr), prescale_effect(nullptr), post_effect(nullptr), - distortion_effect(nullptr), focus_effect(nullptr), phosphor_effect(nullptr), deconverge_effect(nullptr), color_effect(nullptr), ntsc_effect(nullptr), bloom_effect(nullptr), + distortion_effect(nullptr), focus_effect(nullptr), phosphor_effect(nullptr), deconverge_effect(nullptr), color_effect(nullptr), ntsc_effect(nullptr), bloom_effect(nullptr), downsample_effect(nullptr), vector_effect(nullptr), fsfx_vertices(nullptr), curr_texture(nullptr), curr_render_target(nullptr), curr_poly(nullptr), targethead(nullptr), cachehead(nullptr) { } diff --git a/src/osd/modules/render/drawd3d.cpp b/src/osd/modules/render/drawd3d.cpp index ce024866319..a29b747bbe1 100644 --- a/src/osd/modules/render/drawd3d.cpp +++ b/src/osd/modules/render/drawd3d.cpp @@ -565,7 +565,7 @@ int renderer_d3d9::pre_window_draw_check() m_shaders->toggle(); m_sliders_dirty = true; - // re-create resources + // re-create resources if (device_create_resources()) { osd_printf_verbose("Direct3D: failed to recreate resources for device; failing permanently\n"); @@ -834,8 +834,8 @@ int renderer_d3d9::device_create(HWND device_hwnd) try_again: // try for XRGB first m_screen_format = D3DFMT_X8R8G8B8; - HRESULT result = d3dintf->d3dobj->CheckDeviceFormat(m_adapter, D3DDEVTYPE_HAL, m_pixformat, - m_texture_manager->is_dynamic_supported() + HRESULT result = d3dintf->d3dobj->CheckDeviceFormat(m_adapter, D3DDEVTYPE_HAL, m_pixformat, + m_texture_manager->is_dynamic_supported() ? D3DUSAGE_DYNAMIC : 0, D3DRTYPE_TEXTURE, m_screen_format); @@ -865,7 +865,7 @@ try_again: // create the D3D device result = d3dintf->d3dobj->CreateDevice( - m_adapter, D3DDEVTYPE_HAL, device_hwnd, D3DCREATE_SOFTWARE_VERTEXPROCESSING | D3DCREATE_FPU_PRESERVE, &m_presentation, &m_device); + m_adapter, D3DDEVTYPE_HAL, device_hwnd, D3DCREATE_SOFTWARE_VERTEXPROCESSING | D3DCREATE_FPU_PRESERVE, &m_presentation, &m_device); if (FAILED(result)) { // if we got a "DEVICELOST" error, it may be transitory; count it and only fail if @@ -923,7 +923,7 @@ int renderer_d3d9::device_create_resources() HRESULT result = m_device->CreateVertexBuffer( sizeof(vertex) * VERTEX_BUFFER_SIZE, D3DUSAGE_DYNAMIC | D3DUSAGE_SOFTWAREPROCESSING | D3DUSAGE_WRITEONLY, - VERTEX_BASE_FORMAT | ((m_shaders->enabled() && d3dintf->post_fx_available) + VERTEX_BASE_FORMAT | ((m_shaders->enabled() && d3dintf->post_fx_available) ? D3DFVF_XYZW : D3DFVF_XYZRHW), D3DPOOL_DEFAULT, &m_vertexbuf, nullptr); @@ -935,8 +935,8 @@ int renderer_d3d9::device_create_resources() // set the vertex format result = m_device->SetFVF( - (D3DFORMAT)(VERTEX_BASE_FORMAT | ((m_shaders->enabled() && d3dintf->post_fx_available) - ? D3DFVF_XYZW + (D3DFORMAT)(VERTEX_BASE_FORMAT | ((m_shaders->enabled() && d3dintf->post_fx_available) + ? D3DFVF_XYZW : D3DFVF_XYZRHW))); if (FAILED(result)) { @@ -993,9 +993,9 @@ renderer_d3d9::~renderer_d3d9() // todo: throws error when switching from full screen to window mode //if (m_shaders != nullptr) //{ - // // delete the HLSL interface - // global_free(m_shaders); - // m_shaders = nullptr; + // // delete the HLSL interface + // global_free(m_shaders); + // m_shaders = nullptr; //} } @@ -1686,7 +1686,7 @@ void renderer_d3d9::draw_line(const render_primitive &prim) } // now add a polygon entry - m_poly[m_numpolys].init(D3DPT_TRIANGLESTRIP, 2, 4, prim.flags, nullptr, D3DTOP_MODULATE, 0.0f, 1.0f, 0.0f, 0.0f); + m_poly[m_numpolys].init(D3DPT_TRIANGLESTRIP, 2, 4, prim.flags, nullptr, D3DTOP_MODULATE, 0.0f, 1.0f, 0.0f, 0.0f); m_numpolys++; } diff --git a/src/osd/modules/render/winglcontext.h b/src/osd/modules/render/winglcontext.h index ec63b11ff72..f0cb1b6af77 100644 --- a/src/osd/modules/render/winglcontext.h +++ b/src/osd/modules/render/winglcontext.h @@ -156,7 +156,7 @@ private: { if (pfn_wglGetExtensionsStringEXT == nullptr) return false; - + // printf("%s\n", pfn_wglGetExtensionsStringEXT()); if (strstr(pfn_wglGetExtensionsStringEXT(), extension_name) != nullptr) diff --git a/src/osd/modules/sound/xaudio2_sound.cpp b/src/osd/modules/sound/xaudio2_sound.cpp index 0f6ec2b5297..bb45626a6c6 100755 --- a/src/osd/modules/sound/xaudio2_sound.cpp +++ b/src/osd/modules/sound/xaudio2_sound.cpp @@ -287,7 +287,7 @@ int sound_xaudio2::init(osd_options const &options) // Make sure our XAudio2Create entrypoint is bound if (!XAudio2Create) { - osd_printf_error("Could not find XAudio2. Please try to reinstall DirectX runtime package.\n"); + osd_printf_error("Could not find XAudio2. Please try to reinstall DirectX runtime package.\n"); return 1; } @@ -342,7 +342,7 @@ void sound_xaudio2::exit() SetEvent(m_hEventExiting); m_hEventExiting = nullptr; } - + if (m_audioThread.joinable()) m_audioThread.join(); -- cgit v1.2.3