diff options
| author | SND\weimingzhi_cp <SND\weimingzhi_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2010-07-10 07:31:09 +0000 |
|---|---|---|
| committer | SND\weimingzhi_cp <SND\weimingzhi_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2010-07-10 07:31:09 +0000 |
| commit | c3ecafccb27ad933d3082f03473b5b95629930ad (patch) | |
| tree | 3299cbfa3f026c2e1115cb279688aebe3da55efa /plugins/dfcdrom | |
| parent | f7823bc1646f1885bd9a0a19a9645c0e2cb884bd (diff) | |
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@54446 e17a0e51-4ae3-4d35-97c3-1a29b211df97
Diffstat (limited to 'plugins/dfcdrom')
| -rw-r--r-- | plugins/dfcdrom/cdr-libcdio.c | 2 | ||||
| -rw-r--r-- | plugins/dfcdrom/cdr-linux.c | 2 | ||||
| -rw-r--r-- | plugins/dfcdrom/cdr-null.c | 4 | ||||
| -rw-r--r-- | plugins/dfcdrom/cdr.c | 8 |
4 files changed, 7 insertions, 9 deletions
diff --git a/plugins/dfcdrom/cdr-libcdio.c b/plugins/dfcdrom/cdr-libcdio.c index a319bfd1..2b4a309c 100644 --- a/plugins/dfcdrom/cdr-libcdio.c +++ b/plugins/dfcdrom/cdr-libcdio.c @@ -26,8 +26,6 @@ #include <cdio/cdio.h> #include <cdio/mmc.h> -char *LibName = N_("CD-ROM Drive Reader"); - static CdIo_t *cdHandle = NULL; static void SetSpeed(int speed) { diff --git a/plugins/dfcdrom/cdr-linux.c b/plugins/dfcdrom/cdr-linux.c index 2c598076..a814962e 100644 --- a/plugins/dfcdrom/cdr-linux.c +++ b/plugins/dfcdrom/cdr-linux.c @@ -26,8 +26,6 @@ #include "cdr.h" -char *LibName = N_("CD-ROM Drive Reader"); - static int cdHandle = -1; static int ReadMMC = 0, SubQMMC = 0; diff --git a/plugins/dfcdrom/cdr-null.c b/plugins/dfcdrom/cdr-null.c index 275a6b65..87ce911c 100644 --- a/plugins/dfcdrom/cdr-null.c +++ b/plugins/dfcdrom/cdr-null.c @@ -19,12 +19,10 @@ * along with this program; if not, see <http://www.gnu.org/licenses>. */ -#ifdef USENULL +#ifdef USE_NULL #include "cdr.h" -char *LibName = N_("CDR NULL Plugin"); - int OpenCdHandle(const char *dev) { return -1; } diff --git a/plugins/dfcdrom/cdr.c b/plugins/dfcdrom/cdr.c index c83269db..742f5630 100644 --- a/plugins/dfcdrom/cdr.c +++ b/plugins/dfcdrom/cdr.c @@ -21,6 +21,12 @@ #include "cdr.h" +#ifndef USE_NULL +static char *LibName = N_("CD-ROM Drive Reader"); +#else +static char *LibName = N_("CDR NULL Plugin"); +#endif + int initial_time = 0; pthread_mutex_t mut = PTHREAD_MUTEX_INITIALIZER; @@ -52,8 +58,6 @@ unsigned char* (*fGetBuffer)(); void *CdrThread(void *arg); -extern char *LibName; - long CDRinit(void) { thread = -1; return 0; |