you can configure microcode path in Makefile

4 files changed, 17 insertions, 8 deletions

diff --git a/HISTORY b/HISTORY
index 513bd53..e970482 100644
--- a/HISTORY
+++ b/HISTORY
@@ -243,4 +243,5 @@ NOTE: I havent found time to include all of the languages, will be done in pre2
 - cDxr3Interface::ConfigureDevice(): we get now videomode from driver and set only a 
   new one, if the wanted one is different to the driver defaults one.
 - added functions to read and write registers directly with the plugin
-- added basic dolby digital interface
\ No newline at end of file
+- added basic dolby digital interface
+- you can configure microcode path in Makefile - thanks to Sascha Volkenandt <sascha@akv-soft.de>
\ No newline at end of file
diff --git a/Makefile b/Makefile
index 855fc10..41dd8b5 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile,v 1.2 2004/09/18 00:09:20 austriancoder Exp $
+# $Id: Makefile,v 1.3 2004/09/18 01:04:12 austriancoder Exp $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
@@ -56,9 +56,7 @@ DEFINES += -DSOCKET_CHMOD=0660
 DEFINES += -D_GNU_SOURCE
 
 # where is the microcode for the dxr3 located?
-export MICROCODE := /usr/share/misc/em8300.uc
-
-EXTRA_CFLAGS := -DMICROCODE=\"$(MICROCODE)\"
+DEFINES += -DMICROCODE=\"/usr/share/misc/em8300.uc\"
 
 ### The object files (add further files here):
 
diff --git a/dxr3interface.c b/dxr3interface.c
index 6228d05..43aa1ef 100644
--- a/dxr3interface.c
+++ b/dxr3interface.c
@@ -859,15 +859,15 @@ void cDxr3Interface::UploadMicroCode()
 	}
 
     em8300_microcode_t em8300_microcode;    
-    const char* MICRO_CODE_FILE = "/usr/share/misc/em8300.uc";
     struct stat s;
 
 	// try to open it
-    int UCODE = open(MICRO_CODE_FILE, O_RDONLY);
+	// MICROCODE comes from makefile
+    int UCODE = open(MICROCODE, O_RDONLY);
     
     if (UCODE <0) 
 	{
-		cLog::Instance() << "Unable to open microcode file " << MICRO_CODE_FILE << " for reading\n";
+		cLog::Instance() << "Unable to open microcode file " << MICROCODE << " for reading\n";
         exit(1);
     }
 
@@ -1189,6 +1189,13 @@ void cDxr3Interface::WriteRegister(int registernum, int val)
 	ioctl(m_fdControl, EM8300_IOCTL_WRITEREG, &reg);
 }
 
+// ==================================
+//! grabs the current tv screen
+void cDxr3Interface::GrabScreen(int w, int h, char** buf)
+{
+	
+}
+
 // maybe we should copy this routine into em8300 driver
 // ==================================
 //! It appears that the follow routine copies length bytes to memory pointed to
diff --git a/dxr3interface.h b/dxr3interface.h
index a542c15..af177d1 100644
--- a/dxr3interface.h
+++ b/dxr3interface.h
@@ -139,6 +139,9 @@ private:
 	// access registers
 	long ReadRegister(int registernum);
 	void WriteRegister(int registernum, int val);
+	
+	// grab screen
+	void GrabScreen(int w, int h, char** buf);
 
 	// maybe we should copy this routine into em8300 driver
 	char Dxr3CopyYUVData(int pos, int *dst, int length);