summaryrefslogtreecommitdiffstatshomepage
path: root/src/osd
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2013-06-11 07:16:42 +0000
committer Miodrag Milanovic <mmicko@gmail.com>2013-06-11 07:16:42 +0000
commit16f5234d435ee57b65043533f8fa2b105fb15a77 (patch)
treec6f95d84c6a1cb89ced5353230a98e1f61a6938e /src/osd
parent2dc6458ede8c0039e308c994e50acb3b8de2d1ae (diff)
Cleanups and version bumpmame0149
Diffstat (limited to 'src/osd')
-rw-r--r--src/osd/sdl/debugqt.c24
-rw-r--r--src/osd/sdl/debugqtdasmwindow.c4
-rw-r--r--src/osd/sdl/debugqtmainwindow.c32
-rw-r--r--src/osd/windows/d3dhlsl.c1
-rw-r--r--src/osd/windows/d3dhlsl.h12
-rw-r--r--src/osd/windows/debugwin.c2
-rw-r--r--src/osd/windows/window.c1
-rw-r--r--src/osd/windows/windows.mak30
-rw-r--r--src/osd/windows/winmain.c26
9 files changed, 65 insertions, 67 deletions
diff --git a/src/osd/sdl/debugqt.c b/src/osd/sdl/debugqt.c
index b18ef3c4d6d..bb996d1a352 100644
--- a/src/osd/sdl/debugqt.c
+++ b/src/osd/sdl/debugqt.c
@@ -65,8 +65,8 @@ static void xml_configuration_load(running_machine &machine, int config_type, xm
if (parentnode == NULL)
return;
- for (int i = 0; i < xmlConfigurations.size(); i++)
- delete xmlConfigurations[i];
+ for (int i = 0; i < xmlConfigurations.size(); i++)
+ delete xmlConfigurations[i];
xmlConfigurations.clear();
// Configuration load
@@ -79,7 +79,7 @@ static void xml_configuration_load(running_machine &machine, int config_type, xm
case WindowQtConfig::WIN_TYPE_MAIN: xmlConfigurations.push_back(new MainWindowQtConfig()); break;
case WindowQtConfig::WIN_TYPE_MEMORY: xmlConfigurations.push_back(new MemoryWindowQtConfig()); break;
case WindowQtConfig::WIN_TYPE_DASM: xmlConfigurations.push_back(new DasmWindowQtConfig()); break;
- case WindowQtConfig::WIN_TYPE_LOG: xmlConfigurations.push_back(new LogWindowQtConfig()); break;
+ case WindowQtConfig::WIN_TYPE_LOG: xmlConfigurations.push_back(new LogWindowQtConfig()); break;
case WindowQtConfig::WIN_TYPE_BREAK_POINTS: xmlConfigurations.push_back(new BreakpointsWindowQtConfig()); break;
default: continue;
}
@@ -94,9 +94,9 @@ static void xml_configuration_save(running_machine &machine, int config_type, xm
if (config_type != CONFIG_TYPE_GAME)
return;
- for (int i = 0; i < xmlConfigurations.size(); i++)
- {
- WindowQtConfig* config = xmlConfigurations[i];
+ for (int i = 0; i < xmlConfigurations.size(); i++)
+ {
+ WindowQtConfig* config = xmlConfigurations[i];
// Create an xml node
xml_data_node *debugger_node;
@@ -112,8 +112,8 @@ static void xml_configuration_save(running_machine &machine, int config_type, xm
static void gather_save_configurations()
{
- for (int i = 0; i < xmlConfigurations.size(); i++)
- delete xmlConfigurations[i];
+ for (int i = 0; i < xmlConfigurations.size(); i++)
+ delete xmlConfigurations[i];
xmlConfigurations.clear();
// Loop over all the open windows
@@ -163,10 +163,10 @@ static void load_and_clear_main_window_config(std::vector<WindowQtConfig*>& conf
static void setup_additional_startup_windows(running_machine& machine, std::vector<WindowQtConfig*>& configList)
{
- for (int i = 0; i < configList.size(); i++)
- {
- WindowQtConfig* config = configList[i];
-
+ for (int i = 0; i < configList.size(); i++)
+ {
+ WindowQtConfig* config = configList[i];
+
WindowQt* foo = NULL;
switch (config->m_type)
{
diff --git a/src/osd/sdl/debugqtdasmwindow.c b/src/osd/sdl/debugqtdasmwindow.c
index 11ad76b8782..4fe46291f20 100644
--- a/src/osd/sdl/debugqtdasmwindow.c
+++ b/src/osd/sdl/debugqtdasmwindow.c
@@ -107,8 +107,8 @@ DasmWindow::DasmWindow(running_machine* machine, QWidget* parent) :
DasmWindow::~DasmWindow()
{
}
-
-
+
+
void DasmWindow::cpuChanged(int index)
{
m_dasmView->view()->set_source(*m_dasmView->view()->source_list().by_index(index));
diff --git a/src/osd/sdl/debugqtmainwindow.c b/src/osd/sdl/debugqtmainwindow.c
index 3ed8ebac447..62999d8f74f 100644
--- a/src/osd/sdl/debugqtmainwindow.c
+++ b/src/osd/sdl/debugqtmainwindow.c
@@ -297,8 +297,8 @@ void MainWindow::executeCommand(bool withClear)
// Send along the command
debug_console_execute_command(*m_machine,
- command.toLocal8Bit().data(),
- true);
+ command.toLocal8Bit().data(),
+ true);
// Add history & set the index to be the top of the stack
addToHistory(command);
@@ -328,24 +328,24 @@ void MainWindow::mountImage(bool changedTo)
refreshAll();
return;
}
-
+
// File dialog
QString filename = QFileDialog::getOpenFileName(this,
"Select an image file",
QDir::currentPath(),
tr("All files (*.*)"));
-
+
if (img->load(filename.toUtf8().data()) != IMAGE_INIT_PASS)
{
debug_console_printf(*m_machine, "Image could not be mounted.\n");
refreshAll();
return;
}
-
+
// Activate the unmount menu option
QAction* unmountAct = sender()->parent()->findChild<QAction*>("unmount");
unmountAct->setEnabled(true);
-
+
// Set the mount name
QMenu* parentMenuItem = dynamic_cast<QMenu*>(sender()->parent());
QString baseString = parentMenuItem->title();
@@ -364,12 +364,12 @@ void MainWindow::unmountImage(bool changedTo)
const int imageIndex = dynamic_cast<QAction*>(sender())->data().toInt();
image_interface_iterator iter(m_machine->root_device());
device_image_interface *img = iter.byindex(imageIndex);
-
+
img->unload();
-
+
// Deactivate the unmount menu option
dynamic_cast<QAction*>(sender())->setEnabled(false);
-
+
// Set the mount name
QMenu* parentMenuItem = dynamic_cast<QMenu*>(sender()->parent());
QString baseString = parentMenuItem->title();
@@ -411,17 +411,17 @@ void MainWindow::addToHistory(const QString& command)
void MainWindow::createImagesMenu()
{
QMenu* imagesMenu = menuBar()->addMenu("&Images");
-
+
int interfaceIndex = 0;
image_interface_iterator iter(m_machine->root_device());
for (device_image_interface *img = iter.first(); img != NULL; img = iter.next())
{
astring menuName;
menuName.format("%s : %s", img->device().name(), img->exists() ? img->filename() : "[empty slot]");
-
+
QMenu* interfaceMenu = imagesMenu->addMenu(menuName.cstr());
interfaceMenu->setObjectName(img->device().name());
-
+
QAction* mountAct = new QAction("Mount...", interfaceMenu);
QAction* unmountAct = new QAction("Unmount", interfaceMenu);
mountAct->setObjectName("mount");
@@ -430,15 +430,15 @@ void MainWindow::createImagesMenu()
unmountAct->setData(QVariant(interfaceIndex));
connect(mountAct, SIGNAL(triggered(bool)), this, SLOT(mountImage(bool)));
connect(unmountAct, SIGNAL(triggered(bool)), this, SLOT(unmountImage(bool)));
-
+
if (!img->exists())
unmountAct->setEnabled(false);
-
+
interfaceMenu->addAction(mountAct);
interfaceMenu->addAction(unmountAct);
-
+
// TODO: Cassette operations
-
+
interfaceIndex++;
}
}
diff --git a/src/osd/windows/d3dhlsl.c b/src/osd/windows/d3dhlsl.c
index 90d60bff071..ec3b1430c72 100644
--- a/src/osd/windows/d3dhlsl.c
+++ b/src/osd/windows/d3dhlsl.c
@@ -88,7 +88,6 @@ static file_error open_next(d3d::renderer *d3d, emu_file &file, const char *temp
namespace d3d
{
-
hlsl_options shaders::s_hlsl_presets[4] =
{
{ // 25% Shadow mask, 50% Scanlines, 3% Pincushion, 0 defocus, No Tint, 0.9 Exponent, 5% Floor, 25% Phosphor Return, 120% Saturation
diff --git a/src/osd/windows/d3dhlsl.h b/src/osd/windows/d3dhlsl.h
index e712d0e00a7..c3ff303e4da 100644
--- a/src/osd/windows/d3dhlsl.h
+++ b/src/osd/windows/d3dhlsl.h
@@ -182,11 +182,11 @@ public:
struct slider_desc
{
- const char * name;
- int minval;
- int defval;
- int maxval;
- int step;
+ const char * name;
+ int minval;
+ int defval;
+ int maxval;
+ int step;
INT32 (*adjustor)(running_machine &, void *, astring *, INT32);
};
@@ -282,7 +282,7 @@ public:
render_target * targethead;
cache_target * cachehead;
- static slider_desc s_sliders[];
+ static slider_desc s_sliders[];
static hlsl_options s_hlsl_presets[4];
};
diff --git a/src/osd/windows/debugwin.c b/src/osd/windows/debugwin.c
index 9ac5c0528ee..9d3203f2026 100644
--- a/src/osd/windows/debugwin.c
+++ b/src/osd/windows/debugwin.c
@@ -469,7 +469,7 @@ void windows_osd_interface::init_debugger()
// get other metrics
hscroll_height = GetSystemMetrics(SM_CYHSCROLL);
vscroll_width = GetSystemMetrics(SM_CXVSCROLL);
-
+
// ensure we get called on the way out
machine().add_notifier(MACHINE_NOTIFY_EXIT, machine_notify_delegate(FUNC(debugwin_destroy_windows), &machine()));
}
diff --git a/src/osd/windows/window.c b/src/osd/windows/window.c
index 6ab93872752..60828a1cfc7 100644
--- a/src/osd/windows/window.c
+++ b/src/osd/windows/window.c
@@ -1947,4 +1947,3 @@ bool winwindow_qt_filter(void *message)
return false;
}
#endif
-
diff --git a/src/osd/windows/windows.mak b/src/osd/windows/windows.mak
index b0b894d7e92..0ea441cf658 100644
--- a/src/osd/windows/windows.mak
+++ b/src/osd/windows/windows.mak
@@ -358,21 +358,21 @@ $(SDLOBJ)/%.moc.c: $(SDLSRC)/%.h
$(MOC) $(INCPATH) $(DEFS) $< -o $@
OSDOBJS += \
- $(SDLOBJ)/debugqt.o \
- $(SDLOBJ)/debugqtview.o \
- $(SDLOBJ)/debugqtwindow.o \
- $(SDLOBJ)/debugqtlogwindow.o \
- $(SDLOBJ)/debugqtdasmwindow.o \
- $(SDLOBJ)/debugqtmainwindow.o \
- $(SDLOBJ)/debugqtmemorywindow.o \
- $(SDLOBJ)/debugqtbreakpointswindow.o \
- $(SDLOBJ)/debugqtview.moc.o \
- $(SDLOBJ)/debugqtwindow.moc.o \
- $(SDLOBJ)/debugqtlogwindow.moc.o \
- $(SDLOBJ)/debugqtdasmwindow.moc.o \
- $(SDLOBJ)/debugqtmainwindow.moc.o \
- $(SDLOBJ)/debugqtmemorywindow.moc.o \
- $(SDLOBJ)/debugqtbreakpointswindow.moc.o
+ $(SDLOBJ)/debugqt.o \
+ $(SDLOBJ)/debugqtview.o \
+ $(SDLOBJ)/debugqtwindow.o \
+ $(SDLOBJ)/debugqtlogwindow.o \
+ $(SDLOBJ)/debugqtdasmwindow.o \
+ $(SDLOBJ)/debugqtmainwindow.o \
+ $(SDLOBJ)/debugqtmemorywindow.o \
+ $(SDLOBJ)/debugqtbreakpointswindow.o \
+ $(SDLOBJ)/debugqtview.moc.o \
+ $(SDLOBJ)/debugqtwindow.moc.o \
+ $(SDLOBJ)/debugqtlogwindow.moc.o \
+ $(SDLOBJ)/debugqtdasmwindow.moc.o \
+ $(SDLOBJ)/debugqtmainwindow.moc.o \
+ $(SDLOBJ)/debugqtmemorywindow.moc.o \
+ $(SDLOBJ)/debugqtbreakpointswindow.moc.o
endif
#-------------------------------------------------
diff --git a/src/osd/windows/winmain.c b/src/osd/windows/winmain.c
index 6fb390890b0..fb72544e277 100644
--- a/src/osd/windows/winmain.c
+++ b/src/osd/windows/winmain.c
@@ -396,19 +396,19 @@ const options_entry windows_options::s_option_entries[] =
{ WINOPTION_VECTOR_LENGTH_RATIO";vecsize", "500.0", OPTION_FLOAT, "Vector fade length (4.0 - vectors fade the most at and above 4 pixels, etc.)" },
/* Bloom below this line */
{ NULL, NULL, OPTION_HEADER, "BLOOM POST-PROCESSING OPTIONS" },
- { WINOPTION_VECTOR_BLOOM_SCALE, "0.3", OPTION_FLOAT, "Intensity factor for vector bloom" },
- { WINOPTION_RASTER_BLOOM_SCALE, "0.225", OPTION_FLOAT, "Intensity factor for raster bloom" },
- { WINOPTION_BLOOM_LEVEL0_WEIGHT, "1.0", OPTION_FLOAT, "Bloom level 0 (full-size target) weight" },
- { WINOPTION_BLOOM_LEVEL1_WEIGHT, "0.21", OPTION_FLOAT, "Bloom level 1 (half-size target) weight" },
- { WINOPTION_BLOOM_LEVEL2_WEIGHT, "0.19", OPTION_FLOAT, "Bloom level 2 (quarter-size target) weight" },
- { WINOPTION_BLOOM_LEVEL3_WEIGHT, "0.17", OPTION_FLOAT, "Bloom level 3 (.) weight" },
- { WINOPTION_BLOOM_LEVEL4_WEIGHT, "0.15", OPTION_FLOAT, "Bloom level 4 (.) weight" },
- { WINOPTION_BLOOM_LEVEL5_WEIGHT, "0.14", OPTION_FLOAT, "Bloom level 5 (.) weight" },
- { WINOPTION_BLOOM_LEVEL6_WEIGHT, "0.13", OPTION_FLOAT, "Bloom level 6 (.) weight" },
- { WINOPTION_BLOOM_LEVEL7_WEIGHT, "0.12", OPTION_FLOAT, "Bloom level 7 (.) weight" },
- { WINOPTION_BLOOM_LEVEL8_WEIGHT, "0.11", OPTION_FLOAT, "Bloom level 8 (.) weight" },
- { WINOPTION_BLOOM_LEVEL9_WEIGHT, "0.10", OPTION_FLOAT, "Bloom level 9 (.) weight" },
- { WINOPTION_BLOOM_LEVEL10_WEIGHT, "0.09", OPTION_FLOAT, "Bloom level 10 (1x1 target) weight" },
+ { WINOPTION_VECTOR_BLOOM_SCALE, "0.3", OPTION_FLOAT, "Intensity factor for vector bloom" },
+ { WINOPTION_RASTER_BLOOM_SCALE, "0.225", OPTION_FLOAT, "Intensity factor for raster bloom" },
+ { WINOPTION_BLOOM_LEVEL0_WEIGHT, "1.0", OPTION_FLOAT, "Bloom level 0 (full-size target) weight" },
+ { WINOPTION_BLOOM_LEVEL1_WEIGHT, "0.21", OPTION_FLOAT, "Bloom level 1 (half-size target) weight" },
+ { WINOPTION_BLOOM_LEVEL2_WEIGHT, "0.19", OPTION_FLOAT, "Bloom level 2 (quarter-size target) weight" },
+ { WINOPTION_BLOOM_LEVEL3_WEIGHT, "0.17", OPTION_FLOAT, "Bloom level 3 (.) weight" },
+ { WINOPTION_BLOOM_LEVEL4_WEIGHT, "0.15", OPTION_FLOAT, "Bloom level 4 (.) weight" },
+ { WINOPTION_BLOOM_LEVEL5_WEIGHT, "0.14", OPTION_FLOAT, "Bloom level 5 (.) weight" },
+ { WINOPTION_BLOOM_LEVEL6_WEIGHT, "0.13", OPTION_FLOAT, "Bloom level 6 (.) weight" },
+ { WINOPTION_BLOOM_LEVEL7_WEIGHT, "0.12", OPTION_FLOAT, "Bloom level 7 (.) weight" },
+ { WINOPTION_BLOOM_LEVEL8_WEIGHT, "0.11", OPTION_FLOAT, "Bloom level 8 (.) weight" },
+ { WINOPTION_BLOOM_LEVEL9_WEIGHT, "0.10", OPTION_FLOAT, "Bloom level 9 (.) weight" },
+ { WINOPTION_BLOOM_LEVEL10_WEIGHT, "0.09", OPTION_FLOAT, "Bloom level 10 (1x1 target) weight" },
// per-window options
{ NULL, NULL, OPTION_HEADER, "PER-WINDOW VIDEO OPTIONS" },