ui: centralized game info and image info menus to a common

source file (creatively named ui/info.c). nw.

src/emu/emu.mak

@@ -124,7 +124,7 @@ EMUOBJS = \
 	$(EMUOBJ)/ui/filemngr.o \
 	$(EMUOBJ)/ui/filesel.o \
 	$(EMUOBJ)/ui/imgcntrl.o \
-	$(EMUOBJ)/ui/imginfo.o \
+	$(EMUOBJ)/ui/info.o \
 	$(EMUOBJ)/ui/inputmap.o \
 	$(EMUOBJ)/ui/selgame.o \
 	$(EMUOBJ)/ui/slotopt.o \

src/emu/ui/info.c

@@ -1,8 +1,8 @@
 /***************************************************************************
 
-    ui/imginfo.c
+    ui/info.c
 
-    Image info screen
+    System and image info screens
 
     Copyright Nicola Salmoria and the MAME Team.
     Visit http://mamedev.org for licensing and usage restrictions.
@@ -11,35 +11,48 @@
 
 #include "emu.h"
 #include "ui/menu.h"
-#include "ui/imginfo.h"
+#include "ui/info.h"
+#include "ui/ui.h"
+
+/*-------------------------------------------------
+  menu_game_info - handle the game information
+  menu
+ -------------------------------------------------*/
+
+ui_menu_game_info::ui_menu_game_info(running_machine &machine, render_container *container) : ui_menu(machine, container)
+{
+}
+
+ui_menu_game_info::~ui_menu_game_info()
+{
+}
+
+void ui_menu_game_info::populate()
+{
+	astring tempstring;
+	item_append(machine().ui().game_info_astring(tempstring), NULL, MENU_FLAG_MULTILINE, NULL);
+}
+
+void ui_menu_game_info::handle()
+{
+	// process the menu
+	process(0);
+}
 
 
-/***************************************************************************
+/*-------------------------------------------------
-    IMPLEMENTATION
+  ui_menu_image_info - handle the image information
-***************************************************************************/
+  menu
-
+ -------------------------------------------------*/
-//-------------------------------------------------
-//  ctor
-//-------------------------------------------------
 
 ui_menu_image_info::ui_menu_image_info(running_machine &machine, render_container *container) : ui_menu(machine, container)
 {
 }
 
-
-//-------------------------------------------------
-//  dtor
-//-------------------------------------------------
-
 ui_menu_image_info::~ui_menu_image_info()
 {
 }
 
-
-//-------------------------------------------------
-//  populate
-//-------------------------------------------------
-
 void ui_menu_image_info::populate()
 {
 	item_append(machine().system().description, NULL, MENU_FLAG_DISABLE, NULL);
@@ -50,11 +63,6 @@ void ui_menu_image_info::populate()
 			image_info(image);
 }
 
-
-//-------------------------------------------------
-//  handle
-//-------------------------------------------------
-
 void ui_menu_image_info::handle()
 {
 	// process the menu
@@ -62,10 +70,10 @@ void ui_menu_image_info::handle()
 }
 
 
-//-------------------------------------------------
+/*-------------------------------------------------
-//  image_info - display image info for a specific
+  image_info - display image info for a specific
-//  image interface device
+  image interface device
-//-------------------------------------------------
+-------------------------------------------------*/
 
 void ui_menu_image_info::image_info(device_image_interface *image)
 {

src/emu/ui/info.h

@@ -1,8 +1,8 @@
 /***************************************************************************
 
-    ui/imginfo.h
+    ui/info.h
 
-    Image info screen
+    System and image info screens
 
     Copyright Nicola Salmoria and the MAME Team.
     Visit http://mamedev.org for licensing and usage restrictions.
@@ -11,8 +11,17 @@
 
 #pragma once
 
-#ifndef __UI_IMGINFO_H__
+#ifndef __UI_INFO_H__
-#define __UI_IMGINFO_H__
+#define __UI_INFO_H__
+
+class ui_menu_game_info : public ui_menu {
+public:
+	ui_menu_game_info(running_machine &machine, render_container *container);
+	virtual ~ui_menu_game_info();
+	virtual void populate();
+	virtual void handle();
+};
+
 
 class ui_menu_image_info : public ui_menu
 {
@@ -26,4 +35,4 @@ private:
 	void image_info(device_image_interface *image);
 };
 
-#endif // __UI_IMGINFO_H__
+#endif // __UI_INFO_H__

src/emu/ui/mainmenu.c

@@ -19,7 +19,7 @@
 #include "ui/filemngr.h"
 #include "ui/filesel.h"
 #include "ui/barcode.h"
-#include "ui/imginfo.h"
+#include "ui/info.h"
 #include "ui/inputmap.h"
 #include "ui/mainmenu.h"
 #include "ui/miscmenu.h"

src/emu/ui/miscmenu.c

@@ -19,7 +19,6 @@
 #include "rendutil.h"
 
 #include "uiinput.h"
-#include "ui/ui.h"
 #include "ui/miscmenu.h"
 #include "ui/filemngr.h"
 
@@ -304,31 +303,6 @@ void ui_menu_bookkeeping::populate()
 }
 
 
-/*-------------------------------------------------
-    menu_game_info - handle the game information
-    menu
--------------------------------------------------*/
-
-ui_menu_game_info::ui_menu_game_info(running_machine &machine, render_container *container) : ui_menu(machine, container)
-{
-}
-
-void ui_menu_game_info::populate()
-{
-	astring tempstring;
-	item_append(machine().ui().game_info_astring(tempstring), NULL, MENU_FLAG_MULTILINE, NULL);
-}
-
-void ui_menu_game_info::handle()
-{
-	/* process the menu */
-	process(0);
-}
-
-ui_menu_game_info::~ui_menu_game_info()
-{
-}
-
 /*-------------------------------------------------
     menu_cheat - handle the cheat menu
 -------------------------------------------------*/

src/emu/ui/miscmenu.h

@@ -44,14 +44,6 @@ private:
 	attotime prevtime;
 };
 
-class ui_menu_game_info : public ui_menu {
-public:
-	ui_menu_game_info(running_machine &machine, render_container *container);
-	virtual ~ui_menu_game_info();
-	virtual void populate();
-	virtual void handle();
-};
-
 class ui_menu_cheat : public ui_menu {
 public:
 	ui_menu_cheat(running_machine &machine, render_container *container);