summaryrefslogtreecommitdiffstatshomepage
path: root/src/osd/modules
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2015-11-11 17:15:40 +0100
committer Miodrag Milanovic <mmicko@gmail.com>2015-11-11 17:19:26 +0100
commit02f128df25b158ab772e4156132eb7b0e460df11 (patch)
tree0556a88a90e2dfcee5c7fbe0f8360d712a625d6e /src/osd/modules
parentae5167a2d97ad8afe3bba989fe3ba846fa7fe355 (diff)
more cleanups and fix (nw)
Diffstat (limited to 'src/osd/modules')
-rw-r--r--src/osd/modules/debugger/debugint.cpp8
-rw-r--r--src/osd/modules/debugger/debugwin.cpp2
-rw-r--r--src/osd/modules/debugger/win/consolewininfo.cpp3
-rw-r--r--src/osd/modules/debugger/win/debugviewinfo.cpp2
-rw-r--r--src/osd/modules/debugger/win/debugwininfo.cpp3
-rw-r--r--src/osd/modules/debugger/win/disasmwininfo.cpp11
-rw-r--r--src/osd/modules/debugger/win/logwininfo.cpp2
-rw-r--r--src/osd/modules/debugger/win/memorywininfo.cpp6
-rw-r--r--src/osd/modules/debugger/win/pointswininfo.cpp2
-rw-r--r--src/osd/modules/debugger/win/uimetrics.cpp1
-rw-r--r--src/osd/modules/font/font_none.cpp1
-rw-r--r--src/osd/modules/font/font_windows.cpp3
-rw-r--r--src/osd/modules/midi/none.cpp3
-rw-r--r--src/osd/modules/midi/portmidi.cpp4
-rw-r--r--src/osd/modules/netdev/pcap.cpp4
-rw-r--r--src/osd/modules/render/d3d/d3d9intf.cpp3
-rw-r--r--src/osd/modules/render/d3d/d3dhlsl.cpp13
-rw-r--r--src/osd/modules/render/d3d/d3dhlsl.h2
-rw-r--r--src/osd/modules/render/drawd3d.cpp22
-rw-r--r--src/osd/modules/render/drawdd.cpp7
-rw-r--r--src/osd/modules/render/drawnone.cpp2
-rw-r--r--src/osd/modules/render/drawogl.cpp1
-rw-r--r--src/osd/modules/sound/direct_sound.cpp4
-rw-r--r--src/osd/modules/sync/work_osd.cpp4
24 files changed, 42 insertions, 71 deletions
diff --git a/src/osd/modules/debugger/debugint.cpp b/src/osd/modules/debugger/debugint.cpp
index e8ac5891766..181b5c149fa 100644
--- a/src/osd/modules/debugger/debugint.cpp
+++ b/src/osd/modules/debugger/debugint.cpp
@@ -17,7 +17,6 @@
#include "debug/debugvw.h"
#include "debug/dvdisasm.h"
#include "debug/dvmemory.h"
-#include "debug/dvstate.h"
#include "debug/debugcon.h"
#include "debug/debugcpu.h"
@@ -151,10 +150,8 @@ class DView_edit
DISABLE_COPYING(DView_edit);
public:
- DView_edit()
- { }
- ~DView_edit()
- { }
+ DView_edit(): active(0), container(NULL) { }
+ ~DView_edit() { }
int active;
render_container * container;
std::string str;
@@ -1131,7 +1128,6 @@ static void render_editor(DView_edit *editor)
x1 += UI_BOX_LR_BORDER;
x2 -= UI_BOX_LR_BORDER;
y1 += UI_BOX_TB_BORDER;
- y2 -= UI_BOX_TB_BORDER;
/* draw the text within it */
editor->container->manager().machine().ui().draw_text_full(editor->container, editor->str.c_str(), x1, y1, x2 - x1, JUSTIFY_CENTER, WRAP_TRUNCATE,
diff --git a/src/osd/modules/debugger/debugwin.cpp b/src/osd/modules/debugger/debugwin.cpp
index 5f07e0d3057..b7bf048adae 100644
--- a/src/osd/modules/debugger/debugwin.cpp
+++ b/src/osd/modules/debugger/debugwin.cpp
@@ -22,11 +22,9 @@
#include "win/uimetrics.h"
#include "emu.h"
-#include "uiinput.h"
#include "debugger.h"
#include "window.h"
-#include "winmain.h"
#include "../../windows/input.h"
diff --git a/src/osd/modules/debugger/win/consolewininfo.cpp b/src/osd/modules/debugger/win/consolewininfo.cpp
index a55c7b7885f..50c0fced670 100644
--- a/src/osd/modules/debugger/win/consolewininfo.cpp
+++ b/src/osd/modules/debugger/win/consolewininfo.cpp
@@ -9,7 +9,6 @@
#include "consolewininfo.h"
#include "debugviewinfo.h"
-#include "disasmviewinfo.h"
#include "uimetrics.h"
#include "debug/debugcon.h"
@@ -84,7 +83,7 @@ consolewin_info::consolewin_info(debugger_windows_interface &debugger) :
set_cpu(*debug_cpu_get_visible_cpu(machine()));
// mark the edit box as the default focus and set it
- set_default_focus();
+ editwin_info::set_default_focus();
return;
cleanup:
diff --git a/src/osd/modules/debugger/win/debugviewinfo.cpp b/src/osd/modules/debugger/win/debugviewinfo.cpp
index 55b806b0056..1e36655d65d 100644
--- a/src/osd/modules/debugger/win/debugviewinfo.cpp
+++ b/src/osd/modules/debugger/win/debugviewinfo.cpp
@@ -315,7 +315,7 @@ void debugview_info::draw_contents(HDC windc)
// loop twice; once to fill the background and once to draw the text
for (int iter = 0; iter < 2; iter++)
{
- COLORREF fgcolor = RGB(0x00,0x00,0x00);
+ COLORREF fgcolor;
COLORREF bgcolor = RGB(0xff,0xff,0xff);
HBRUSH bgbrush = NULL;
int last_attrib = -1;
diff --git a/src/osd/modules/debugger/win/debugwininfo.cpp b/src/osd/modules/debugger/win/debugwininfo.cpp
index 078a87c15c7..79468e3793b 100644
--- a/src/osd/modules/debugger/win/debugwininfo.cpp
+++ b/src/osd/modules/debugger/win/debugwininfo.cpp
@@ -11,9 +11,6 @@
#include "debugviewinfo.h"
#include "debug/debugcpu.h"
-#include "imagedev/cassette.h"
-
-#include "strconv.h"
#include "window.h"
#include "winutf8.h"
diff --git a/src/osd/modules/debugger/win/disasmwininfo.cpp b/src/osd/modules/debugger/win/disasmwininfo.cpp
index 5d9c72f3fc6..ae7e3894458 100644
--- a/src/osd/modules/debugger/win/disasmwininfo.cpp
+++ b/src/osd/modules/debugger/win/disasmwininfo.cpp
@@ -11,11 +11,6 @@
#include "debugviewinfo.h"
#include "disasmviewinfo.h"
#include "uimetrics.h"
-
-#include "debugger.h"
-#include "debug/debugcon.h"
-#include "debug/debugcpu.h"
-
#include "winutf8.h"
@@ -38,14 +33,14 @@ disasmwin_info::disasmwin_info(debugger_windows_interface &debugger) :
update_caption();
// recompute the children once to get the maxwidth
- recompute_children();
+ disasmwin_info::recompute_children();
// position the window and recompute children again
SetWindowPos(window(), HWND_TOP, 100, 100, maxwidth(), 200, SWP_SHOWWINDOW);
- recompute_children();
+ disasmwin_info::recompute_children();
// mark the edit box as the default focus and set it
- set_default_focus();
+ editwin_info::set_default_focus();
}
diff --git a/src/osd/modules/debugger/win/logwininfo.cpp b/src/osd/modules/debugger/win/logwininfo.cpp
index c623245db72..6610e8a296f 100644
--- a/src/osd/modules/debugger/win/logwininfo.cpp
+++ b/src/osd/modules/debugger/win/logwininfo.cpp
@@ -38,7 +38,7 @@ logwin_info::logwin_info(debugger_windows_interface &debugger) :
SetWindowPos(window(), HWND_TOP, 100, 100, bounds.right - bounds.left, bounds.bottom - bounds.top, SWP_SHOWWINDOW);
// recompute the children
- recompute_children();
+ debugwin_info::recompute_children();
}
diff --git a/src/osd/modules/debugger/win/memorywininfo.cpp b/src/osd/modules/debugger/win/memorywininfo.cpp
index 0c67bdf01da..e925dbaa26b 100644
--- a/src/osd/modules/debugger/win/memorywininfo.cpp
+++ b/src/osd/modules/debugger/win/memorywininfo.cpp
@@ -59,14 +59,14 @@ memorywin_info::memorywin_info(debugger_windows_interface &debugger) :
update_caption();
// recompute the children once to get the maxwidth
- recompute_children();
+ memorywin_info::recompute_children();
// position the window and recompute children again
SetWindowPos(window(), HWND_TOP, 100, 100, maxwidth(), 200, SWP_SHOWWINDOW);
- recompute_children();
+ memorywin_info::recompute_children();
// mark the edit box as the default focus and set it
- set_default_focus();
+ editwin_info::set_default_focus();
}
diff --git a/src/osd/modules/debugger/win/pointswininfo.cpp b/src/osd/modules/debugger/win/pointswininfo.cpp
index 5ed28a17e16..6dd56cc50cc 100644
--- a/src/osd/modules/debugger/win/pointswininfo.cpp
+++ b/src/osd/modules/debugger/win/pointswininfo.cpp
@@ -46,7 +46,7 @@ pointswin_info::pointswin_info(debugger_windows_interface &debugger) :
SetWindowPos(window(), HWND_TOP, 100, 100, bounds.right - bounds.left, bounds.bottom - bounds.top, SWP_SHOWWINDOW);
// recompute the children
- recompute_children();
+ debugwin_info::recompute_children();
}
diff --git a/src/osd/modules/debugger/win/uimetrics.cpp b/src/osd/modules/debugger/win/uimetrics.cpp
index 17a74bf73e7..aebbf1cfe06 100644
--- a/src/osd/modules/debugger/win/uimetrics.cpp
+++ b/src/osd/modules/debugger/win/uimetrics.cpp
@@ -31,7 +31,6 @@ ui_metrics::ui_metrics(osd_options const &options) :
m_debug_font = CreateFont(-MulDiv((size <= 0) ? 9 : size, GetDeviceCaps(temp_dc, LOGPIXELSY), 72), 0, 0, 0, FW_MEDIUM, FALSE, FALSE, FALSE,
ANSI_CHARSET, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, DEFAULT_QUALITY, FIXED_PITCH, t_face);
osd_free(t_face);
- t_face = NULL;
if (m_debug_font == NULL)
fatalerror("Unable to create debugger font\n");
diff --git a/src/osd/modules/font/font_none.cpp b/src/osd/modules/font/font_none.cpp
index 5021eef9d58..7ea689c8f35 100644
--- a/src/osd/modules/font/font_none.cpp
+++ b/src/osd/modules/font/font_none.cpp
@@ -21,7 +21,6 @@ public:
virtual bool open(const char *font_path, const char *name, int &height);
virtual void close();
virtual bool get_bitmap(unicode_char chnum, bitmap_argb32 &bitmap, INT32 &width, INT32 &xoffs, INT32 &yoffs);
-private:
};
bool osd_font_none::open(const char *font_path, const char *_name, int &height)
diff --git a/src/osd/modules/font/font_windows.cpp b/src/osd/modules/font/font_windows.cpp
index 26454c96810..e6ae37bdfc6 100644
--- a/src/osd/modules/font/font_windows.cpp
+++ b/src/osd/modules/font/font_windows.cpp
@@ -34,8 +34,9 @@
//-------------------------------------------------
class osd_font_windows : public osd_font
-{
+{
public:
+ osd_font_windows(): m_font(NULL) { }
virtual ~osd_font_windows() { }
virtual bool open(const char *font_path, const char *name, int &height);
diff --git a/src/osd/modules/midi/none.cpp b/src/osd/modules/midi/none.cpp
index 6195aa78d89..12e15558a4d 100644
--- a/src/osd/modules/midi/none.cpp
+++ b/src/osd/modules/midi/none.cpp
@@ -41,9 +41,6 @@ public:
virtual bool poll();
virtual int read(UINT8 *pOut);
virtual void write(UINT8 data);
-
-private:
- //int dummy;
};
osd_midi_device *none_module::create_midi_device()
diff --git a/src/osd/modules/midi/portmidi.cpp b/src/osd/modules/midi/portmidi.cpp
index 02dad28ffc1..df92b0b9a37 100644
--- a/src/osd/modules/midi/portmidi.cpp
+++ b/src/osd/modules/midi/portmidi.cpp
@@ -44,8 +44,9 @@ static const int RX_EVENT_BUF_SIZE = 512;
#define MIDI_EOX 0xf7
class osd_midi_device_pm : public osd_midi_device
-{
+{
public:
+ osd_midi_device_pm(): pmStream(NULL), xmit_cnt(0), last_status(0), rx_sysex(false) { }
virtual ~osd_midi_device_pm() { }
virtual bool open_input(const char *devname);
virtual bool open_output(const char *devname);
@@ -208,7 +209,6 @@ bool osd_midi_device_pm::open_output(const char *devname)
{
return false;
}
- return false;
}
void osd_midi_device_pm::close()
diff --git a/src/osd/modules/netdev/pcap.cpp b/src/osd/modules/netdev/pcap.cpp
index 3f3e20ef7f4..833548cfabb 100644
--- a/src/osd/modules/netdev/pcap.cpp
+++ b/src/osd/modules/netdev/pcap.cpp
@@ -168,7 +168,7 @@ netdev_pcap::netdev_pcap(const char *name, class device_network_interface *ifdev
m_p = NULL;
return;
}
- set_mac(get_mac());
+ netdev_pcap::set_mac(get_mac());
#ifdef SDLMAME_MACOSX
m_ctx.head = 0;
@@ -206,7 +206,7 @@ int netdev_pcap::send(UINT8 *buf, int len)
ret = pcap_sendpacket_dl(m_p, buf, len);
printf("sent packet length %d, returned %d\n", len, ret);
return ret ? len : 0;
- return (!pcap_sendpacket_dl(m_p, buf, len))?len:0;
+ //return (!pcap_sendpacket_dl(m_p, buf, len))?len:0;
}
int netdev_pcap::recv_dev(UINT8 **buf)
diff --git a/src/osd/modules/render/d3d/d3d9intf.cpp b/src/osd/modules/render/d3d/d3d9intf.cpp
index f6ed962e5f6..d6751b6ca21 100644
--- a/src/osd/modules/render/d3d/d3d9intf.cpp
+++ b/src/osd/modules/render/d3d/d3d9intf.cpp
@@ -18,7 +18,6 @@
// MAMEOS headers
#include "d3dintf.h"
-#include "winmain.h"
@@ -83,7 +82,6 @@ base *drawd3d9_init(void)
{
osd_printf_verbose("Direct3D: Unable to find Direct3DCreate9\n");
FreeLibrary(dllhandle);
- dllhandle = NULL;
return NULL;
}
@@ -93,7 +91,6 @@ base *drawd3d9_init(void)
{
osd_printf_verbose("Direct3D: Error attempting to initialize Direct3D9\n");
FreeLibrary(dllhandle);
- dllhandle = NULL;
return NULL;
}
diff --git a/src/osd/modules/render/d3d/d3dhlsl.cpp b/src/osd/modules/render/d3d/d3dhlsl.cpp
index 00603e45e82..fa07e1f4592 100644
--- a/src/osd/modules/render/d3d/d3dhlsl.cpp
+++ b/src/osd/modules/render/d3d/d3dhlsl.cpp
@@ -29,7 +29,6 @@
#include "render.h"
#include "ui/ui.h"
#include "rendutil.h"
-#include "options.h"
#include "emuopts.h"
#include "aviio.h"
#include "png.h"
@@ -39,7 +38,6 @@
#include "d3dintf.h"
#include "winmain.h"
#include "window.h"
-#include "config.h"
#include "d3dcomm.h"
#include "modules/render/drawd3d.h"
#include "strconv.h"
@@ -178,7 +176,14 @@ static direct3dx9_loadeffect_ptr g_load_effect = NULL;
// shader manager constructor
//============================================================
-shaders::shaders()
+shaders::shaders():
+ d3dintf(NULL), machine(NULL), d3d(NULL), num_screens(0), curr_screen(0), curr_frame(0), write_ini(false), read_ini(false), hlsl_prescale_x(0), hlsl_prescale_y(0), bloom_count(0),
+ vecbuf_type(), vecbuf_index(0), vecbuf_count(0), avi_output_file(NULL), avi_frame(0), avi_copy_surface(NULL), avi_copy_texture(NULL), avi_final_target(NULL), avi_final_texture(NULL),
+ black_surface(NULL), black_texture(NULL), render_snap(false), snap_rendered(false), snap_copy_target(NULL), snap_copy_texture(NULL), snap_target(NULL), snap_texture(NULL),
+ snap_width(0), snap_height(0), lines_pending(false), backbuffer(NULL), curr_effect(NULL), default_effect(NULL), prescale_effect(NULL), post_effect(NULL), distortion_effect(NULL),
+ focus_effect(NULL), phosphor_effect(NULL), deconverge_effect(NULL), color_effect(NULL), yiq_encode_effect(NULL), yiq_decode_effect(NULL), bloom_effect(NULL),
+ downsample_effect(NULL), vector_effect(NULL), fsfx_vertices(NULL), curr_texture(NULL), curr_render_target(NULL), curr_poly(NULL)
+
{
master_enable = false;
vector_enable = true;
@@ -3435,7 +3440,7 @@ static file_error open_next(d3d::renderer *d3d, emu_file &file, const char *temp
// find length of the device name
int end1 = snapstr.find("/", pos + 3);
int end2 = snapstr.find("%", pos + 3);
- int end = -1;
+ int end;
if ((end1 != -1) && (end2 != -1))
{
diff --git a/src/osd/modules/render/d3d/d3dhlsl.h b/src/osd/modules/render/d3d/d3dhlsl.h
index 6c9c14faaf5..46f762b83e2 100644
--- a/src/osd/modules/render/d3d/d3dhlsl.h
+++ b/src/osd/modules/render/d3d/d3dhlsl.h
@@ -20,6 +20,8 @@
// TYPE DEFINITIONS
//============================================================
+struct slider_state;
+
namespace d3d
{
class effect;
diff --git a/src/osd/modules/render/drawd3d.cpp b/src/osd/modules/render/drawd3d.cpp
index 12e4403fec1..5231aa879db 100644
--- a/src/osd/modules/render/drawd3d.cpp
+++ b/src/osd/modules/render/drawd3d.cpp
@@ -27,19 +27,15 @@
// MAME headers
#include "emu.h"
#include "render.h"
-#include "ui/ui.h"
+
#include "rendutil.h"
-#include "options.h"
#include "emuopts.h"
#include "aviio.h"
-#include "png.h"
// MAMEOS headers
#include "modules/render/d3d/d3dintf.h"
#include "winmain.h"
#include "window.h"
-#include "config.h"
-#include "strconv.h"
#include "modules/render/d3d/d3dcomm.h"
#include "drawd3d.h"
@@ -616,19 +612,11 @@ texture_info *texture_manager::find_texinfo(const render_texinfo *texinfo, UINT3
}
renderer::renderer(osd_window *window)
- : osd_renderer(window, FLAG_NONE)
+ : osd_renderer(window, FLAG_NONE), m_adapter(0), m_width(0), m_height(0), m_refresh(0), m_create_error_count(0), m_device(NULL), m_gamma_supported(0), m_pixformat(),
+ m_vertexbuf(NULL), m_lockedbuf(NULL), m_numverts(0), m_vectorbatch(NULL), m_batchindex(0), m_numpolys(0), m_restarting(false), m_mod2x_supported(0), m_mod4x_supported(0),
+ m_screen_format(), m_last_texture(NULL), m_last_texture_flags(0), m_last_blendenable(0), m_last_blendop(0), m_last_blendsrc(0), m_last_blenddst(0), m_last_filter(0),
+ m_last_wrap(), m_last_modmode(0), m_hlsl_buf(NULL), m_shaders(NULL), m_texture_manager(NULL), m_line_count(0)
{
- m_device = NULL;
- m_restarting = false;
- m_shaders = NULL;
- m_numverts = 0;
- m_numpolys = 0;
- m_vertexbuf = NULL;
- m_lockedbuf = NULL;
- m_vectorbatch = NULL;
- m_last_texture = NULL;
- m_hlsl_buf = NULL;
- m_texture_manager = NULL;
}
int renderer::initialize()
diff --git a/src/osd/modules/render/drawdd.cpp b/src/osd/modules/render/drawdd.cpp
index 01abda6ad6d..0240b8fc26e 100644
--- a/src/osd/modules/render/drawdd.cpp
+++ b/src/osd/modules/render/drawdd.cpp
@@ -17,13 +17,11 @@
#include "emu.h"
#include "render.h"
#include "rendutil.h"
-#include "options.h"
#include "rendersw.inc"
// MAMEOS headers
#include "winmain.h"
#include "window.h"
-#include "config.h"
@@ -40,7 +38,10 @@ class renderer_dd : public osd_renderer
{
public:
renderer_dd(osd_window *window)
- : osd_renderer(window, FLAG_NONE),
+ : osd_renderer(window, FLAG_NONE),
+ width(0),
+ height(0),
+ refresh(0),
//adapter(0),
adapter_ptr(NULL),
clearouter(0),
diff --git a/src/osd/modules/render/drawnone.cpp b/src/osd/modules/render/drawnone.cpp
index ee7bc229935..08bd81666ca 100644
--- a/src/osd/modules/render/drawnone.cpp
+++ b/src/osd/modules/render/drawnone.cpp
@@ -32,8 +32,6 @@ public:
virtual void record() { };
virtual void toggle_fsfx() { };
virtual void destroy();
-
-private:
};
//============================================================
diff --git a/src/osd/modules/render/drawogl.cpp b/src/osd/modules/render/drawogl.cpp
index 5a139c4054b..de04e04a580 100644
--- a/src/osd/modules/render/drawogl.cpp
+++ b/src/osd/modules/render/drawogl.cpp
@@ -19,7 +19,6 @@
// MAME headers
#include "osdcomm.h"
#include "emu.h"
-#include "options.h"
#include "emuopts.h"
#ifndef OSD_WINDOWS
diff --git a/src/osd/modules/sound/direct_sound.cpp b/src/osd/modules/sound/direct_sound.cpp
index 19c5f7055ed..01610e2a9d3 100644
--- a/src/osd/modules/sound/direct_sound.cpp
+++ b/src/osd/modules/sound/direct_sound.cpp
@@ -174,7 +174,7 @@ private:
memcpy(m_bytes2, (UINT8 const *)data + m_locked1, bytes - m_locked1);
}
- result = unlock();
+ unlock();
return DS_OK;
}
HRESULT clear()
@@ -189,7 +189,7 @@ private:
assert(0U == m_locked2);
memset(m_bytes1, 0, m_locked1);
- result = unlock();
+ unlock();
return DS_OK;
}
diff --git a/src/osd/modules/sync/work_osd.cpp b/src/osd/modules/sync/work_osd.cpp
index 34a3c6b5851..e5582584666 100644
--- a/src/osd/modules/sync/work_osd.cpp
+++ b/src/osd/modules/sync/work_osd.cpp
@@ -444,12 +444,12 @@ osd_work_item *osd_work_item_queue_multiple(osd_work_queue *queue, osd_work_call
osd_work_item *item;
// first allocate a new work item; try the free list first
- INT32 lockslot = osd_scalable_lock_acquire(queue->lock);
+ INT32 myslot = osd_scalable_lock_acquire(queue->lock);
do
{
item = (osd_work_item *)queue->free;
} while (item != NULL && compare_exchange_ptr((PVOID volatile *)&queue->free, item, item->next) != item);
- osd_scalable_lock_release(queue->lock, lockslot);
+ osd_scalable_lock_release(queue->lock, myslot);
// if nothing, allocate something new
if (item == NULL)