Commited patch in issue #8171 (by darktjm).

git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@64524 e17a0e51-4ae3-4d35-97c3-1a29b211df97

1 files changed, 1 insertions, 28 deletions

diff --git a/plugins/dfcdrom/cdr.h b/plugins/dfcdrom/cdr.h
index 88291dca..928683d3 100644
--- a/plugins/dfcdrom/cdr.h
+++ b/plugins/dfcdrom/cdr.h
@@ -26,16 +26,6 @@
 
 #include "config.h"
 
-#ifdef ENABLE_NLS
-#include <libintl.h>
-#include <locale.h>
-#define _(x)  gettext(x)
-#define N_(x) (x)
-#else
-#define _(x)  (x)
-#define N_(x) (x)
-#endif
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdint.h>
@@ -151,24 +141,6 @@ typedef struct _MMC_READ_CD {
 #define itob(i)		((i)/10*16 + (i)%10)	/* u_char to BCD */
 #define btoi(b)		((b)/16*10 + (b)%16)	/* BCD to u_char */
 
-struct CdrStat {
-	unsigned long Type;
-	unsigned long Status;
-	unsigned char Time[3];		// current playing time
-};
-
-struct SubQ {
-	char res0[12];
-	unsigned char ControlAndADR;
-	unsigned char TrackNumber;
-	unsigned char IndexNumber;
-	unsigned char TrackRelativeAddress[3];
-	unsigned char Filler;
-	unsigned char AbsoluteAddress[3];
-	unsigned char CRC[2];
-	char res1[72];
-};
-
 typedef union {
 	struct cdrom_msf msf;
 	unsigned char buf[CD_FRAMESIZE_RAW];
@@ -210,6 +182,7 @@ long GetTE(unsigned char track, unsigned char *m, unsigned char *s, unsigned cha
 long ReadSector(crdata *cr);
 long PlayCDDA(unsigned char *sector);
 long StopCDDA();
+#include "psemu_plugin_defs.h"
 long GetStatus(int playing, struct CdrStat *stat);
 unsigned char *ReadSub(const unsigned char *time);