summaryrefslogtreecommitdiffstatshomepage
path: root/src
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2016-11-23 14:26:04 +0100
committer Miodrag Milanovic <mmicko@gmail.com>2016-11-23 14:26:04 +0100
commitd718d3cc3d20a2e420ed30ddb820b29b90d81b33 (patch)
tree2132f5c7c80f33ac1734669f4043ac2461044c54 /src
parenta69e00dacd1bd73a6bafb6c7638b9513dcbeb895 (diff)
Made ldplayer regular driver, same as vgmplay (nw)
Diffstat (limited to 'src')
-rw-r--r--src/ldplayer/layout/LICENSE116
-rw-r--r--src/ldplayer/layout/README.md6
-rw-r--r--src/ldplayer/ldplayer.lst13
-rw-r--r--src/mame/drivers/ldplayer.cpp (renamed from src/ldplayer/ldplayer.cpp)25
-rw-r--r--src/mame/layout/pr8210.lay (renamed from src/ldplayer/layout/pr8210.lay)0
-rw-r--r--src/mame/mame.lst3
-rw-r--r--src/mame/virtual.flt1
-rw-r--r--src/mame/virtual.lst3
8 files changed, 5 insertions, 162 deletions
diff --git a/src/ldplayer/layout/LICENSE b/src/ldplayer/layout/LICENSE
deleted file mode 100644
index 670154e3538..00000000000
--- a/src/ldplayer/layout/LICENSE
+++ /dev/null
@@ -1,116 +0,0 @@
-CC0 1.0 Universal
-
-Statement of Purpose
-
-The laws of most jurisdictions throughout the world automatically confer
-exclusive Copyright and Related Rights (defined below) upon the creator and
-subsequent owner(s) (each and all, an "owner") of an original work of
-authorship and/or a database (each, a "Work").
-
-Certain owners wish to permanently relinquish those rights to a Work for the
-purpose of contributing to a commons of creative, cultural and scientific
-works ("Commons") that the public can reliably and without fear of later
-claims of infringement build upon, modify, incorporate in other works, reuse
-and redistribute as freely as possible in any form whatsoever and for any
-purposes, including without limitation commercial purposes. These owners may
-contribute to the Commons to promote the ideal of a free culture and the
-further production of creative, cultural and scientific works, or to gain
-reputation or greater distribution for their Work in part through the use and
-efforts of others.
-
-For these and/or other purposes and motivations, and without any expectation
-of additional consideration or compensation, the person associating CC0 with a
-Work (the "Affirmer"), to the extent that he or she is an owner of Copyright
-and Related Rights in the Work, voluntarily elects to apply CC0 to the Work
-and publicly distribute the Work under its terms, with knowledge of his or her
-Copyright and Related Rights in the Work and the meaning and intended legal
-effect of CC0 on those rights.
-
-1. Copyright and Related Rights. A Work made available under CC0 may be
-protected by copyright and related or neighboring rights ("Copyright and
-Related Rights"). Copyright and Related Rights include, but are not limited
-to, the following:
-
- i. the right to reproduce, adapt, distribute, perform, display, communicate,
- and translate a Work;
-
- ii. moral rights retained by the original author(s) and/or performer(s);
-
- iii. publicity and privacy rights pertaining to a person's image or likeness
- depicted in a Work;
-
- iv. rights protecting against unfair competition in regards to a Work,
- subject to the limitations in paragraph 4(a), below;
-
- v. rights protecting the extraction, dissemination, use and reuse of data in
- a Work;
-
- vi. database rights (such as those arising under Directive 96/9/EC of the
- European Parliament and of the Council of 11 March 1996 on the legal
- protection of databases, and under any national implementation thereof,
- including any amended or successor version of such directive); and
-
- vii. other similar, equivalent or corresponding rights throughout the world
- based on applicable law or treaty, and any national implementations thereof.
-
-2. Waiver. To the greatest extent permitted by, but not in contravention of,
-applicable law, Affirmer hereby overtly, fully, permanently, irrevocably and
-unconditionally waives, abandons, and surrenders all of Affirmer's Copyright
-and Related Rights and associated claims and causes of action, whether now
-known or unknown (including existing as well as future claims and causes of
-action), in the Work (i) in all territories worldwide, (ii) for the maximum
-duration provided by applicable law or treaty (including future time
-extensions), (iii) in any current or future medium and for any number of
-copies, and (iv) for any purpose whatsoever, including without limitation
-commercial, advertising or promotional purposes (the "Waiver"). Affirmer makes
-the Waiver for the benefit of each member of the public at large and to the
-detriment of Affirmer's heirs and successors, fully intending that such Waiver
-shall not be subject to revocation, rescission, cancellation, termination, or
-any other legal or equitable action to disrupt the quiet enjoyment of the Work
-by the public as contemplated by Affirmer's express Statement of Purpose.
-
-3. Public License Fallback. Should any part of the Waiver for any reason be
-judged legally invalid or ineffective under applicable law, then the Waiver
-shall be preserved to the maximum extent permitted taking into account
-Affirmer's express Statement of Purpose. In addition, to the extent the Waiver
-is so judged Affirmer hereby grants to each affected person a royalty-free,
-non transferable, non sublicensable, non exclusive, irrevocable and
-unconditional license to exercise Affirmer's Copyright and Related Rights in
-the Work (i) in all territories worldwide, (ii) for the maximum duration
-provided by applicable law or treaty (including future time extensions), (iii)
-in any current or future medium and for any number of copies, and (iv) for any
-purpose whatsoever, including without limitation commercial, advertising or
-promotional purposes (the "License"). The License shall be deemed effective as
-of the date CC0 was applied by Affirmer to the Work. Should any part of the
-License for any reason be judged legally invalid or ineffective under
-applicable law, such partial invalidity or ineffectiveness shall not
-invalidate the remainder of the License, and in such case Affirmer hereby
-affirms that he or she will not (i) exercise any of his or her remaining
-Copyright and Related Rights in the Work or (ii) assert any associated claims
-and causes of action with respect to the Work, in either case contrary to
-Affirmer's express Statement of Purpose.
-
-4. Limitations and Disclaimers.
-
- a. No trademark or patent rights held by Affirmer are waived, abandoned,
- surrendered, licensed or otherwise affected by this document.
-
- b. Affirmer offers the Work as-is and makes no representations or warranties
- of any kind concerning the Work, express, implied, statutory or otherwise,
- including without limitation warranties of title, merchantability, fitness
- for a particular purpose, non infringement, or the absence of latent or
- other defects, accuracy, or the present or absence of errors, whether or not
- discoverable, all to the greatest extent permissible under applicable law.
-
- c. Affirmer disclaims responsibility for clearing rights of other persons
- that may apply to the Work or any use thereof, including without limitation
- any person's Copyright and Related Rights in the Work. Further, Affirmer
- disclaims responsibility for obtaining any necessary consents, permissions
- or other rights required for any use of the Work.
-
- d. Affirmer understands and acknowledges that Creative Commons is not a
- party to this document and has no duty or obligation with respect to this
- CC0 or use of the Work.
-
-For more information, please see
-<http://creativecommons.org/publicdomain/zero/1.0/>
diff --git a/src/ldplayer/layout/README.md b/src/ldplayer/layout/README.md
deleted file mode 100644
index 78ef2e5e6ad..00000000000
--- a/src/ldplayer/layout/README.md
+++ /dev/null
@@ -1,6 +0,0 @@
-# **Layout** #
-
-Layouts files are definiton files to describe look and fell of emulated machines, and are product
-of many different contributors.
-
-Licensed under [CC0 1.0 Universal (CC0 1.0)](https://creativecommons.org/publicdomain/zero/1.0/) \ No newline at end of file
diff --git a/src/ldplayer/ldplayer.lst b/src/ldplayer/ldplayer.lst
deleted file mode 100644
index 836a4d245a5..00000000000
--- a/src/ldplayer/ldplayer.lst
+++ /dev/null
@@ -1,13 +0,0 @@
-// license:BSD-3-Clause
-// copyright-holders:Aaron Giles
-/******************************************************************************
-
- ldpdriv.c
-
- List of all enabled drivers in the system. This file is parsed by
- makelist.exe, sorted, and output as C code describing the drivers.
-
-******************************************************************************/
-
-ldv1000 // Pioneer LD-V1000
-pr8210 // Pioneer PR-8210
diff --git a/src/ldplayer/ldplayer.cpp b/src/mame/drivers/ldplayer.cpp
index 37b9c170573..1bb320931d1 100644
--- a/src/ldplayer/ldplayer.cpp
+++ b/src/mame/drivers/ldplayer.cpp
@@ -18,31 +18,6 @@
#include "pr8210.lh"
-
-#define APPNAME "MAME"
-#define APPNAME_LOWER "mame"
-#define CONFIGNAME "mame"
-#define COPYRIGHT "Copyright Nicola Salmoria\nand the MAME team\nhttp://mamedev.org"
-#define COPYRIGHT_INFO "Copyright Nicola Salmoria and the MAME team"
-
-const char * emulator_info::get_appname() { return APPNAME;}
-const char * emulator_info::get_appname_lower() { return APPNAME_LOWER;}
-const char * emulator_info::get_configname() { return CONFIGNAME;}
-const char * emulator_info::get_copyright() { return COPYRIGHT;}
-const char * emulator_info::get_copyright_info() { return COPYRIGHT_INFO;}
-
-/*************************************
- *
- * Constants
- *
- *************************************/
-
-/*************************************
- *
- * Globals
- *
- *************************************/
-
class ldplayer_state : public driver_device
{
public:
diff --git a/src/ldplayer/layout/pr8210.lay b/src/mame/layout/pr8210.lay
index 709d1346039..709d1346039 100644
--- a/src/ldplayer/layout/pr8210.lay
+++ b/src/mame/layout/pr8210.lay
diff --git a/src/mame/mame.lst b/src/mame/mame.lst
index c1f737fb4e5..c851b2592e2 100644
--- a/src/mame/mame.lst
+++ b/src/mame/mame.lst
@@ -37913,3 +37913,6 @@ zx97 //
@source:vgmplay.cpp
vgmplay
+@source:ldplayer.cpp
+ldv1000 // Pioneer LD-V1000
+pr8210 // Pioneer PR-8210
diff --git a/src/mame/virtual.flt b/src/mame/virtual.flt
deleted file mode 100644
index 8373a776c00..00000000000
--- a/src/mame/virtual.flt
+++ /dev/null
@@ -1 +0,0 @@
-vgmplay.cpp
diff --git a/src/mame/virtual.lst b/src/mame/virtual.lst
index 27a3e40416c..0c0d962f6e2 100644
--- a/src/mame/virtual.lst
+++ b/src/mame/virtual.lst
@@ -1,4 +1,5 @@
// license:BSD-3-Clause
// copyright-holders:Olivier Galibert
-@source:vgmplay.cpp
vgmplay
+ldv1000
+pr8210