pmplib-commits

[Pmplib-commits] SF.net SVN: pmplib: [24] trunk/lib/pmp

[<ny...@us...>]

Revision: 24
Author:   nyaochi
Date:     2006-06-02 15:52:34 -0700 (Fri, 02 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/pmplib/?rev=24&view=rev

Log Message:
-----------
Fixed a typo.

Modified Paths:
--------------
    trunk/frontend/easypmp/cui/main.c
    trunk/lib/pmp/pmp_posix.c
Modified: trunk/frontend/easypmp/cui/main.c
===================================================================
--- trunk/frontend/easypmp/cui/main.c	2006-06-02 22:28:30 UTC (rev 23)
+++ trunk/frontend/easypmp/cui/main.c	2006-06-02 22:52:34 UTC (rev 24)
@@ -157,6 +157,7 @@
 	case EASYPMPPLP_END:
 		break;
 	}
+	fflush(fpe);
 
 	return 0;
 }
@@ -286,9 +287,9 @@
 	}
 
 	// Create a PMP instance.
-	pmphelp_create(pmphelp, &pmp, opt.path_to_root, opt.model);
+	ret = pmphelp_create(pmphelp, &pmp, opt.path_to_root, opt.model);
 	if (!pmp) {
-		fprintf(fpe, "Failed to find a player\n");
+		fprintf(fpe, "Failed to find a player (%d)\n", ret);
 		return 1;
 	}
 

Modified: trunk/lib/pmp/pmp_posix.c
===================================================================
--- trunk/lib/pmp/pmp_posix.c	2006-06-02 22:28:30 UTC (rev 23)
+++ trunk/lib/pmp/pmp_posix.c	2006-06-02 22:52:34 UTC (rev 24)
@@ -111,7 +111,7 @@
 	pmphelp_posix_t* pmphelpposix = (pmphelp_posix_t*)pmphelp;
 	uint32_t i;
 	for (i = 0;i < pmphelpposix->num_plugins;++i) {
-		pmp_enumerate_devid_t func = (pmp_enumerate_devid_t)lt_dlsym(pmphelpw32->plugins[i], "pmp_enumerate_devid");
+		pmp_enumerate_devid_t func = (pmp_enumerate_devid_t)lt_dlsym(pmphelpposix->plugins[i], "pmp_enumerate_devid");
 		if (func) {
 			func(callback, instance);
 		}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Pmplib-commits] SF.net SVN: pmplib: [29] trunk/lib/pmp

[<ny...@us...>]

Revision: 29
Author:   nyaochi
Date:     2006-06-03 10:47:05 -0700 (Sat, 03 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/pmplib/?rev=29&view=rev

Log Message:
-----------
Small fixes from Martin Ellis

Modified Paths:
--------------
    trunk/lib/pmp/pmp_posix.c
    trunk/lib/pmp_iriverplus2/Makefile.am
Modified: trunk/lib/pmp/pmp_posix.c
===================================================================
--- trunk/lib/pmp/pmp_posix.c	2006-06-03 17:37:08 UTC (rev 28)
+++ trunk/lib/pmp/pmp_posix.c	2006-06-03 17:47:05 UTC (rev 29)
@@ -37,7 +37,7 @@
 
 typedef struct {
 	uint32_t num_plugins;
-	void **plugins;
+	lt_dlhandle **plugins;
 } pmphelp_posix_t;
 
 uint32_t interlocked_increment(uint32_t* count)
@@ -99,7 +99,7 @@
 	uint32_t i;
 
 	for (i = 0;i < pmphelpposix->num_plugins;++i) {
-		dlclose(pmphelpposix->plugins[i]);
+		lt_dlhandle(pmphelpposix->plugins[i]);
 	}
 	free(pmphelpposix->plugins);
 	free(pmphelpposix);

Modified: trunk/lib/pmp_iriverplus2/Makefile.am
===================================================================
--- trunk/lib/pmp_iriverplus2/Makefile.am	2006-06-03 17:37:08 UTC (rev 28)
+++ trunk/lib/pmp_iriverplus2/Makefile.am	2006-06-03 17:47:05 UTC (rev 29)
@@ -25,7 +25,7 @@
 	pmp_iriverplus2.c
 
 libpmp_iriverplus2_la_LDFLAGS = \
-	-no-undefined  -module -avoid-versions \
+	-no-undefined  -module -avoid-version \
 	-export-symbols ../pmp/pmp_plugin.sym
 
 libpmp_iriverplus2_la_LIBADD = \


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Pmplib-commits] SF.net SVN: pmplib: [33] trunk/lib/pmp

[<suc...@us...>]

Revision: 33
Author:   sucknblow
Date:     2006-06-03 15:25:38 -0700 (Sat, 03 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/pmplib/?rev=33&view=rev

Log Message:
-----------
Revert LDADD->LIBADD thinko.
Install plugins into /usr/lib/pmp again.

Modified Paths:
--------------
    trunk/frontend/easypmp/cui/Makefile.am
    trunk/lib/pmp/pmp_posix.c
    trunk/lib/pmp_iriverplus2/Makefile.am
    trunk/lib/pmp_irivnavi/Makefile.am
    trunk/lib/pmp_portalplayer1/Makefile.am
Modified: trunk/frontend/easypmp/cui/Makefile.am
===================================================================
--- trunk/frontend/easypmp/cui/Makefile.am	2006-06-03 22:04:42 UTC (rev 32)
+++ trunk/frontend/easypmp/cui/Makefile.am	2006-06-03 22:25:38 UTC (rev 33)
@@ -21,7 +21,7 @@
 INCLUDES = @INCLUDES@ -I../common
 AM_LDFLAGS = @LDFLAGS@
 
-easypmp_LIBADD = \
+easypmp_LDADD = \
 	$(top_builddir)/lib/ucs2/libucs2.la \
 	$(top_builddir)/lib/filepath/libfilepath.la \
 	$(top_builddir)/lib/gmi/libgmi.la \

Modified: trunk/lib/pmp/pmp_posix.c
===================================================================
--- trunk/lib/pmp/pmp_posix.c	2006-06-03 22:04:42 UTC (rev 32)
+++ trunk/lib/pmp/pmp_posix.c	2006-06-03 22:25:38 UTC (rev 33)
@@ -62,7 +62,7 @@
 	lt_dlinit();
 	lt_dlsetsearchpath(PMP_MODULES_DIR);
 
-	inst = lt_dlopenext("libpmp_portalplayer1");
+	inst = lt_dlopenext("portalplayer1");
 	if (inst) {
 		pmphelp->num_plugins++;
 		pmphelp->plugins = (lt_dlhandle*)realloc(pmphelp->plugins, sizeof(lt_dlhandle) * pmphelp->num_plugins);
@@ -71,7 +71,7 @@
 		fprintf(stderr, "FAILED: pmp_portalplayer1 in %s\n", PMP_MODULES_DIR);
 	}
 
-	inst = lt_dlopenext("libpmp_iriverplus2");
+	inst = lt_dlopenext("iriverplus2");
 	if (inst) {
 		pmphelp->num_plugins++;
 		pmphelp->plugins = (lt_dlhandle*)realloc(pmphelp->plugins, sizeof(lt_dlhandle) * pmphelp->num_plugins);
@@ -80,7 +80,7 @@
 		fprintf(stderr, "FAILED: pmp_iriverplus2\n");
 	}
 
-	inst = lt_dlopenext("libpmp_irivnavi");
+	inst = lt_dlopenext("irivnavi");
 	if (inst) {
 		pmphelp->num_plugins++;
 		pmphelp->plugins = (lt_dlhandle*)realloc(pmphelp->plugins, sizeof(lt_dlhandle) * pmphelp->num_plugins);

Modified: trunk/lib/pmp_iriverplus2/Makefile.am
===================================================================
--- trunk/lib/pmp_iriverplus2/Makefile.am	2006-06-03 22:04:42 UTC (rev 32)
+++ trunk/lib/pmp_iriverplus2/Makefile.am	2006-06-03 22:25:38 UTC (rev 33)
@@ -1,10 +1,9 @@
 # $Id$
 
-libpmpdir=$(libdir)/pmp
+pmpdir=$(libdir)/pmp
+pmp_LTLIBRARIES = iriverplus2.la
 
-lib_LTLIBRARIES = libpmp_iriverplus2.la
-
-libpmp_iriverplus2_la_SOURCES = \
+iriverplus2_la_SOURCES = \
 	../../include/pmp.h \
 	dat.c \
 	idx.c \
@@ -24,11 +23,11 @@
 	util.h \
 	pmp_iriverplus2.c
 
-libpmp_iriverplus2_la_LDFLAGS = \
+iriverplus2_la_LDFLAGS = \
 	-no-undefined  -module -avoid-version \
 	-export-symbols ../pmp/pmp_plugin.sym
 
-libpmp_iriverplus2_la_LIBADD = \
+iriverplus2_la_LIBADD = \
 	$(top_builddir)/lib/ucs2/libucs2.la \
 	$(top_builddir)/lib/filepath/libfilepath.la \
 	$(top_builddir)/lib/pmp/libpmp.la

Modified: trunk/lib/pmp_irivnavi/Makefile.am
===================================================================
--- trunk/lib/pmp_irivnavi/Makefile.am	2006-06-03 22:04:42 UTC (rev 32)
+++ trunk/lib/pmp_irivnavi/Makefile.am	2006-06-03 22:25:38 UTC (rev 33)
@@ -1,10 +1,9 @@
 # $Id$
 
-libpmpdir=$(libdir)/pmp
+pmpdir=$(libdir)/pmp
+pmp_LTLIBRARIES = irivnavi.la
 
-lib_LTLIBRARIES = libpmp_irivnavi.la
-
-libpmp_irivnavi_la_SOURCES = \
+irivnavi_la_SOURCES = \
 	../../include/pmp.h \
 	../../include/pmphelp.h \
 	irivnavi.c \
@@ -14,11 +13,11 @@
 	serialize.h \
 	pmp_irivnavi.c
 
-libpmp_irivnavi_la_LDFLAGS = \
+irivnavi_la_LDFLAGS = \
 	-no-undefined -module -avoid-version \
 	-export-symbols ../pmp/pmp_plugin.sym
 
-libpmp_irivnavi_la_LIBADD = \
+irivnavi_la_LIBADD = \
 	$(top_builddir)/lib/ucs2/libucs2.la \
 	$(top_builddir)/lib/filepath/libfilepath.la \
 	$(top_builddir)/lib/pmp/libpmp.la

Modified: trunk/lib/pmp_portalplayer1/Makefile.am
===================================================================
--- trunk/lib/pmp_portalplayer1/Makefile.am	2006-06-03 22:04:42 UTC (rev 32)
+++ trunk/lib/pmp_portalplayer1/Makefile.am	2006-06-03 22:25:38 UTC (rev 33)
@@ -1,10 +1,9 @@
 # $Id$
 
-libpmpdir=$(libdir)/pmp
+pmpdir=$(libdir)/pmp
+pmp_LTLIBRARIES = portalplayer1.la
 
-lib_LTLIBRARIES = libpmp_portalplayer1.la
-
-libpmp_portalplayer1_la_SOURCES = \
+portalplayer1_la_SOURCES = \
 	../../include/pmp.h \
 	hdr.c \
 	hdr_template.c \
@@ -28,11 +27,11 @@
 	model_samsung.c \
 	pmp_portalplayer1.c
 
-libpmp_portalplayer1_la_LDFLAGS = \
+portalplayer1_la_LDFLAGS = \
 	-no-undefined -module -avoid-version \
 	-export-symbols ../pmp/pmp_plugin.sym
 
-libpmp_portalplayer1_la_LIBADD = \
+portalplayer1_la_LIBADD = \
 	$(top_builddir)/lib/ucs2/libucs2.la \
 	$(top_builddir)/lib/filepath/libfilepath.la \
 	$(top_builddir)/lib/pmp/libpmp.la


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Pmplib-commits] SF.net SVN: pmplib: [41] trunk/lib/pmp

[<ny...@us...>]

Revision: 41
Author:   nyaochi
Date:     2006-06-03 21:04:35 -0700 (Sat, 03 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/pmplib/?rev=41&view=rev

Log Message:
-----------
Changed "$PREFIX/*/pmp" to "$PREFIX/*/pmplib" before they propagate.
IMHO, the project name is more appropriate for the location.

Modified Paths:
--------------
    trunk/frontend/easypmp/cui/Makefile.am
    trunk/lib/playlist/Makefile.am
    trunk/lib/pmp/Makefile.am
    trunk/lib/pmp_iriverplus2/Makefile.am
    trunk/lib/pmp_irivnavi/Makefile.am
    trunk/lib/pmp_portalplayer1/Makefile.am
Modified: trunk/frontend/easypmp/cui/Makefile.am
===================================================================
--- trunk/frontend/easypmp/cui/Makefile.am	2006-06-04 03:54:19 UTC (rev 40)
+++ trunk/frontend/easypmp/cui/Makefile.am	2006-06-04 04:04:35 UTC (rev 41)
@@ -23,7 +23,7 @@
 INCLUDES = @INCLUDES@
 AM_LDFLAGS = @LDFLAGS@
 
-easypmp_CFLAGS = -DPMP_JSPL_DIR="\"$(prefix)/share/pmp/jspl\""
+easypmp_CFLAGS = -DPMP_JSPL_DIR="\"$(prefix)/share/@PACKAGE@/jspl\""
 
 easypmp_LDADD = \
 	$(top_builddir)/lib/ucs2/libucs2.la \

Modified: trunk/lib/playlist/Makefile.am
===================================================================
--- trunk/lib/playlist/Makefile.am	2006-06-04 03:54:19 UTC (rev 40)
+++ trunk/lib/playlist/Makefile.am	2006-06-04 04:04:35 UTC (rev 41)
@@ -1,6 +1,6 @@
 # $Id$
 
-jspldir = $(prefix)/share/pmp/jspl
+jspldir = $(prefix)/share/@PACKAGE@/jspl
 jspl_DATA = \
 	jspl/playlist.js \
 	jspl/artist.jspl \

Modified: trunk/lib/pmp/Makefile.am
===================================================================
--- trunk/lib/pmp/Makefile.am	2006-06-04 03:54:19 UTC (rev 40)
+++ trunk/lib/pmp/Makefile.am	2006-06-04 04:04:35 UTC (rev 41)
@@ -8,7 +8,7 @@
 	pmp.c \
 	pmp_posix.c
 
-libpmp_la_CPPFLAGS = -DPMP_MODULES_DIR="\"$(libdir)/pmp\"" $(LTDLINCL)
+libpmp_la_CPPFLAGS = -DPMP_MODULES_DIR="\"$(libdir)/@PACKAGE@\"" $(LTDLINCL)
 
 libpmp_la_LDFLAGS = \
 	-no-undefined

Modified: trunk/lib/pmp_iriverplus2/Makefile.am
===================================================================
--- trunk/lib/pmp_iriverplus2/Makefile.am	2006-06-04 03:54:19 UTC (rev 40)
+++ trunk/lib/pmp_iriverplus2/Makefile.am	2006-06-04 04:04:35 UTC (rev 41)
@@ -1,6 +1,6 @@
 # $Id$
 
-pmpdir=$(libdir)/pmp
+pmpdir=$(libdir)/@PACKAGE@
 pmp_LTLIBRARIES = iriverplus2.la
 
 iriverplus2_la_SOURCES = \

Modified: trunk/lib/pmp_irivnavi/Makefile.am
===================================================================
--- trunk/lib/pmp_irivnavi/Makefile.am	2006-06-04 03:54:19 UTC (rev 40)
+++ trunk/lib/pmp_irivnavi/Makefile.am	2006-06-04 04:04:35 UTC (rev 41)
@@ -1,6 +1,6 @@
 # $Id$
 
-pmpdir=$(libdir)/pmp
+pmpdir=$(libdir)/@PACKAGE@
 pmp_LTLIBRARIES = irivnavi.la
 
 irivnavi_la_SOURCES = \

Modified: trunk/lib/pmp_portalplayer1/Makefile.am
===================================================================
--- trunk/lib/pmp_portalplayer1/Makefile.am	2006-06-04 03:54:19 UTC (rev 40)
+++ trunk/lib/pmp_portalplayer1/Makefile.am	2006-06-04 04:04:35 UTC (rev 41)
@@ -1,6 +1,6 @@
 # $Id$
 
-pmpdir=$(libdir)/pmp
+pmpdir=$(libdir)/@PACKAGE@
 pmp_LTLIBRARIES = portalplayer1.la
 
 portalplayer1_la_SOURCES = \


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Pmplib-commits] SF.net SVN: pmplib: [65] trunk/lib/pmp

[<suc...@us...>]

Revision: 65
Author:   sucknblow
Date:     2006-06-24 20:05:48 -0700 (Sat, 24 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/pmplib/?rev=65&view=rev

Log Message:
-----------
Ignore auto-generated build system files.

Property Changed:
----------------
    trunk/lib/filepath/
    trunk/lib/gmi/
    trunk/lib/playlist/
    trunk/lib/pmp/
    trunk/lib/pmp_iriverplus2/
    trunk/lib/pmp_irivnavi/
    trunk/lib/pmp_portalplayer1/

Property changes on: trunk/lib/filepath
___________________________________________________________________
Name: svn:ignore
   + Makefile.in
Makefile
.libs
.deps



Property changes on: trunk/lib/gmi
___________________________________________________________________
Name: svn:ignore
   + Makefile.in
Makefile
.libs
.deps



Property changes on: trunk/lib/playlist
___________________________________________________________________
Name: svn:ignore
   + Makefile.in
Makefile
.libs
.deps



Property changes on: trunk/lib/pmp
___________________________________________________________________
Name: svn:ignore
   + Makefile.in
Makefile
.libs
.deps



Property changes on: trunk/lib/pmp_iriverplus2
___________________________________________________________________
Name: svn:ignore
   + Makefile.in
Makefile
.libs
.deps



Property changes on: trunk/lib/pmp_irivnavi
___________________________________________________________________
Name: svn:ignore
   + Makefile.in
Makefile
.libs
.deps



Property changes on: trunk/lib/pmp_portalplayer1
___________________________________________________________________
Name: svn:ignore
   + Makefile.in
Makefile
.libs
.deps



This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.