diff -cr openmhp-0.0.1b/Makefile openmhp-dev/Makefile *** openmhp-0.0.1b/Makefile 2005-07-20 16:56:27.000000000 +0300 --- openmhp-dev/Makefile 2005-07-26 16:46:52.000000000 +0300 *************** *** 41,46 **** --- 41,49 ---- -include $(VDRDIR)/Make.config + ### Pass down VDRDIR variable: + export VDRDIR + ### The version number of VDR (taken from VDR's "config.h"): VDRVERSION = $(shell grep 'define VDRVERSION ' $(VDRDIR)/config.h | awk '{ print $$3 }' | sed -e 's/"//g') diff -cr openmhp-0.0.1b/i18n.h openmhp-dev/i18n.h *** openmhp-0.0.1b/i18n.h 2005-07-20 16:56:27.000000000 +0300 --- openmhp-dev/i18n.h 2005-07-29 15:36:45.000000000 +0300 *************** *** 34,39 **** --- 34,81 ---- ""}, */ + // Main menu entry + {"OpenMHP", + "", + "", + "", + "", + "", + "", + "", + "OpenMHP", //--s-- + "", + "", + "", + "", + "", + "", + "", + "", + "", + ""}, + + // Plugin description + {"Plugin for running MHP applications", + "", + "", + "", + "", + "", + "", + "", + "Plugin MHP-sovellusten suorittamista varten", //--s-- + "", + "", + "", + "", + "", + "", + "", + "", + "", + ""}, + {"Enable dithering", "", "", *************** *** 134,141 **** "", ""}, ! ! {"Mhp cache location", "", "", "", --- 176,182 ---- "", ""}, ! {"MHP cache location", "", "", "", *************** *** 143,149 **** "", "", "", ! "Mhp -välimuistin sijainti", //--s-- "", "", "", --- 184,190 ---- "", "", "", ! "MHP-välimuistin sijainti", //--s-- "", "", "", *************** *** 163,169 **** "", "", "", ! "Virtuaalinen X palvelin", //--s-- "", "", "", --- 204,230 ---- "", "", "", ! "Virtuaalinen X-palvelin", //--s-- ! "", ! "", ! "", ! "", ! "", ! "", ! "", ! "", ! "", ! ""}, ! ! {"Virtual X display number", ! "", ! "", ! "", ! "", ! "", ! "", ! "", ! "Virtuaalisen X:n näytön numero", //--s-- "", "", "", *************** *** 175,180 **** --- 236,242 ---- "", ""}, + /* currently not used, meant for "Virtual X server: none" */ {"none", "", "", *************** *** 183,189 **** "", "", "", ! "ei mitään", //--s-- "", "", "", --- 245,334 ---- "", "", "", ! "ei käytössä", //--s-- ! "", ! "", ! "", ! "", ! "", ! "", ! "", ! "", ! "", ! ""}, ! ! {"OpenMHP output", ! "", ! "", ! "", ! "", ! "", ! "", ! "", ! "OpenMHP:n tulostus", //--s-- ! "", ! "", ! "", ! "", ! "", ! "", ! "", ! "", ! "", ! ""}, ! ! /* Currently not used, meant for "OpenMHP output: discard" */ ! {"discard", ! "", ! "", ! "", ! "", ! "", ! "", ! "", ! "hylkää", //--s-- ! "", ! "", ! "", ! "", ! "", ! "", ! "", ! "", ! "", ! ""}, ! ! /* Currently not used, meant for "OpenMHP output: log" */ ! {"log", ! "", ! "", ! "", ! "", ! "", ! "", ! "", ! "vie lokiin", //--s-- ! "", ! "", ! "", ! "", ! "", ! "", ! "", ! "", ! "", ! ""}, ! ! /* Currently not used, meant for "OpenMHP output: display" */ ! {"display", ! "", ! "", ! "", ! "", ! "", ! "", ! "", ! "näytä", //--s-- "", "", "", diff -cr openmhp-0.0.1b/libopenmhp/Makefile openmhp-dev/libopenmhp/Makefile *** openmhp-0.0.1b/libopenmhp/Makefile 2005-07-20 16:56:27.000000000 +0300 --- openmhp-dev/libopenmhp/Makefile 2005-08-01 14:41:28.000000000 +0300 *************** *** 1,9 **** ! CXX=g++ ! CXXFLAGS=-g -c -Wall # -I/usr/include/libxml2 LIBOPENMHP_DIR=$(shell pwd) # LIBOPENMHP_PATHNAME=$(LIBOPENMHP_DIR)/openmhp.h ! LIBOPENMHP_PATHNAME=/tmp/openmhp.h LIBOPENMHP_PROJID=1 DEFINES = -DMHPTOCLIENT_FIFO='"/tmp/libopenmhp-mhptoclient"' -DCLIENTTOMHP_FIFO='"/tmp/libopenmhp-clienttomhp"' -DLIBOPENMHP_DIR='"$(LIBOPENMHP_DIR)"' -DLIBOPENMHP_PATHNAME='"$(LIBOPENMHP_PATHNAME)"' -DLIBOPENMHP_PROJID='$(LIBOPENMHP_PROJID)' --- 1,14 ---- ! ### Allow user defined options to overwrite defaults: ! # (VDR specific...) ! -include $(VDRDIR)/../Make.config ! ! CXX ?= g++ ! CXXFLAGS = -g -c -Wall ! AR = ar # -I/usr/include/libxml2 LIBOPENMHP_DIR=$(shell pwd) # LIBOPENMHP_PATHNAME=$(LIBOPENMHP_DIR)/openmhp.h ! LIBOPENMHP_PATHNAME=/tmp/openmhp.h # do not change LIBOPENMHP_PROJID=1 DEFINES = -DMHPTOCLIENT_FIFO='"/tmp/libopenmhp-mhptoclient"' -DCLIENTTOMHP_FIFO='"/tmp/libopenmhp-clienttomhp"' -DLIBOPENMHP_DIR='"$(LIBOPENMHP_DIR)"' -DLIBOPENMHP_PATHNAME='"$(LIBOPENMHP_PATHNAME)"' -DLIBOPENMHP_PROJID='$(LIBOPENMHP_PROJID)' *************** *** 17,23 **** static: libopenmhp.a # java_jni libopenmhp.a: xlet.o event.o xml/handler.o xml/element.o xml/parser.o ! @ar rcs libopenmhp.a xlet.o event.o xml/handler.o xml/element.o xml/parser.o libopenmhp.so: xlet.o event.o xml/handler.o xml/element.o xml/parser.o $(CXX) -shared -Wl,-soname,libopenmhp.so.1 \ --- 22,28 ---- static: libopenmhp.a # java_jni libopenmhp.a: xlet.o event.o xml/handler.o xml/element.o xml/parser.o ! $(AR) rcs libopenmhp.a xlet.o event.o xml/handler.o xml/element.o xml/parser.o libopenmhp.so: xlet.o event.o xml/handler.o xml/element.o xml/parser.o $(CXX) -shared -Wl,-soname,libopenmhp.so.1 \ *************** *** 44,47 **** clean: @rm -rf *.o *.so *.a *~ ! @rm -rf xml/*.o *~ --- 49,52 ---- clean: @rm -rf *.o *.so *.a *~ ! @rm -rf xml/*.o xml/*~ diff -cr openmhp-0.0.1b/libopenmhp/exec_java.sh openmhp-dev/libopenmhp/exec_java.sh *** openmhp-0.0.1b/libopenmhp/exec_java.sh 2005-07-20 16:56:27.000000000 +0300 --- openmhp-dev/libopenmhp/exec_java.sh 2005-07-28 14:16:41.000000000 +0300 *************** *** 21,29 **** LIB_JAVA=`pwd`/PLUGINS/src/openmhp/libopenmhp/java OPENMHP_DIR=/home/vdr/openmhp_lib # directory for log files: ! mkdir /tmp/openmhp-log 2>/dev/null cd $BASEDIR --- 21,30 ---- LIB_JAVA=`pwd`/PLUGINS/src/openmhp/libopenmhp/java OPENMHP_DIR=/home/vdr/openmhp_lib + LOGDIR=/tmp/openmhp-log # directory for log files: ! mkdir $LOGDIR 2>/dev/null cd $BASEDIR *************** *** 38,44 **** OPENMHP_ERR="/dev/stderr" ;; "log") ! OPENMHP_OUT="/tmp/openmhp/openmhp-$NAME.log" OPENMHP_ERR="2>&1" ;; "discard") --- 39,45 ---- OPENMHP_ERR="/dev/stderr" ;; "log") ! OPENMHP_OUT="$LOGDIR/$NAME.log" OPENMHP_ERR="2>&1" ;; "discard") diff -cr openmhp-0.0.1b/libopenmhp/xlet.cpp openmhp-dev/libopenmhp/xlet.cpp *** openmhp-0.0.1b/libopenmhp/xlet.cpp 2005-07-20 16:56:27.000000000 +0300 --- openmhp-dev/libopenmhp/xlet.cpp 2005-07-26 16:49:17.000000000 +0300 *************** *** 38,44 **** path = strdup(Path); java_pid = -1; clientToMhp = NULL; - read_thread = 0; connected = false; cXlet::activeInstance = this; --- 38,43 ---- diff -cr openmhp-0.0.1b/libopenmhp/xlet.hpp openmhp-dev/libopenmhp/xlet.hpp *** openmhp-0.0.1b/libopenmhp/xlet.hpp 2005-07-20 16:56:27.000000000 +0300 --- openmhp-dev/libopenmhp/xlet.hpp 2005-07-26 16:49:22.000000000 +0300 *************** *** 21,27 **** bool connected; int shmid; // shared memory segment id. int *shm; // pointer to shared memory area. - pthread_t read_thread; /* Registered event observers. Array of pointers to lists of * pointers to event observers ;) Length of the array is set by * EVENT_TYPE_CNT, and array indexes correspond to observable event --- 21,26 ---- diff -cr openmhp-0.0.1b/libopenmhp/xml/parser.hpp openmhp-dev/libopenmhp/xml/parser.hpp *** openmhp-0.0.1b/libopenmhp/xml/parser.hpp 2005-07-20 16:56:27.000000000 +0300 --- openmhp-dev/libopenmhp/xml/parser.hpp 2005-07-27 11:44:56.000000000 +0300 *************** *** 26,32 **** class cXMLParser { private: FILE *in; ! // may hold the next character of the XML input: int readLeftover; // Read next XML bit into a provided buffer, and return its type: eSegmentType ReadSegment(char *buffer, int bf_size); --- 26,32 ---- class cXMLParser { private: FILE *in; ! // may hold the next character of the XML input file: int readLeftover; // Read next XML bit into a provided buffer, and return its type: eSegmentType ReadSegment(char *buffer, int bf_size); diff -cr openmhp-0.0.1b/openmhp.h openmhp-dev/openmhp.h *** openmhp-0.0.1b/openmhp.h 2005-07-20 16:56:27.000000000 +0300 --- openmhp-dev/openmhp.h 2005-07-28 14:55:18.000000000 +0300 *************** *** 18,24 **** // #include static const char *VERSION = "0.0.1b"; ! static const char *DESCRIPTION = "OpenMHP plugin"; static const char *MAINMENUENTRY = "OpenMHP"; #define MAXPATHLENGTH 200 --- 18,24 ---- // #include static const char *VERSION = "0.0.1b"; ! static const char *DESCRIPTION = "Plugin for running MHP applications"; static const char *MAINMENUENTRY = "OpenMHP"; #define MAXPATHLENGTH 200 *************** *** 51,63 **** cPluginOpenmhp(void); virtual ~cPluginOpenmhp(); virtual const char *Version(void) { return VERSION; } ! virtual const char *Description(void) { return DESCRIPTION; } virtual const char *CommandLineHelp(void); virtual bool ProcessArgs(int argc, char *argv[]); virtual bool Initialize(void); virtual bool Start(void); virtual void Housekeeping(void); ! virtual const char *MainMenuEntry(void) { return MAINMENUENTRY; } virtual cOsdObject *MainMenuAction(void); virtual cMenuSetupPage *SetupMenu(void); virtual bool SetupParse(const char *Name, const char *Value); --- 51,63 ---- cPluginOpenmhp(void); virtual ~cPluginOpenmhp(); virtual const char *Version(void) { return VERSION; } ! virtual const char *Description(void) { return tr(DESCRIPTION); } virtual const char *CommandLineHelp(void); virtual bool ProcessArgs(int argc, char *argv[]); virtual bool Initialize(void); virtual bool Start(void); virtual void Housekeeping(void); ! virtual const char *MainMenuEntry(void) { return tr(MAINMENUENTRY); } virtual cOsdObject *MainMenuAction(void); virtual cMenuSetupPage *SetupMenu(void); virtual bool SetupParse(const char *Name, const char *Value); diff -cr openmhp-0.0.1b/setup.c openmhp-dev/setup.c *** openmhp-0.0.1b/setup.c 2005-07-20 16:56:27.000000000 +0300 --- openmhp-dev/setup.c 2005-07-28 14:20:22.000000000 +0300 *************** *** 36,42 **** bitdepthChoiceCount, bitdepthChoices)); Add(new cMenuEditIntItem(tr("OSD size (\%)"), &newOsdScale, 10,100)); Add(new cMenuEditBoolItem(tr("Enable dithering"), &newDitheringEnabled)); ! Add(new cMenuEditStrItem(tr("Mhp cache location"), newMhpCacheDir, MAXPATHLENGTH, // file system characters (incomplete, TODO) "abcdefghijklmnopqrstuvwxyz/~_-.")); --- 36,42 ---- bitdepthChoiceCount, bitdepthChoices)); Add(new cMenuEditIntItem(tr("OSD size (\%)"), &newOsdScale, 10,100)); Add(new cMenuEditBoolItem(tr("Enable dithering"), &newDitheringEnabled)); ! Add(new cMenuEditStrItem(tr("MHP cache location"), newMhpCacheDir, MAXPATHLENGTH, // file system characters (incomplete, TODO) "abcdefghijklmnopqrstuvwxyz/~_-."));