From c1f4033581e83dd9bcad23e9c73023de8c3f3497 Mon Sep 17 00:00:00 2001
From: Qball Cow <Qball@Sarine.nl>
Date: Sat, 3 Nov 2007 15:22:37 +0100
Subject: [PATCH] Fix versioning

---
 configure.ac    | 15 +++++++++++++--
 src/Makefile.am |  6 ------
 src/plugin.c    | 22 ++++++++--------------
 3 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/configure.ac b/configure.ac
index b8b2cb4..e8fbfa9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,17 @@
+m4_define([plugin_major_version], [0])
+m4_define([plugin_minor_version], [15])
+m4_define([plugin_micro_version], [4])
+m4_define([plugin_nano_version], [100])
+m4_define([plugin_version],[plugin_major_version.plugin_minor_version.plugin_micro_version.plugin_nano_version])
+
 AC_INIT(src)
 AM_CONFIG_HEADER([config.h])
-AM_INIT_AUTOMAKE([gmpc-qosd], [0.15.4.99],qball@qballcow.nl)
+AM_INIT_AUTOMAKE([gmpc-qosd], [plugin_version],qball@qballcow.nl)
+
+AC_DEFINE(PLUGIN_MAJOR_VERSION, plugin_major_version, ["Major version of plugin"])
+AC_DEFINE(PLUGIN_MINOR_VERSION, plugin_minor_version, ["Minor version of plugin"])
+AC_DEFINE(PLUGIN_MICRO_VERSION, plugin_micro_version, ["Micro version of plugin"])
+AC_DEFINE(PLUGIN_NANO_VERSION, plugin_nano_version, ["Nano version of plugin"])
 
 AC_PROG_CC
 AM_DISABLE_STATIC
@@ -16,7 +27,7 @@ PKG_CHECK_MODULES([gmpcqosd],
 	cairo
 	libxml-2.0
 	libmpd >= 0.14.99
-	gmpc >= 0.15.4.99
+	gmpc >= 0.15.4.100
 ])
 AC_SUBST(gmpcqosd_LIBS)
 AC_SUBST(gmpcqosd_CFLAGS)
diff --git a/src/Makefile.am b/src/Makefile.am
index c2a2270..07b8b44 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -14,9 +14,3 @@ qosdplugin_la_LDFLAGS= -module -avoid-version
 
 EXTRA_DIST=		\
 	qosd.h
-
-install: 
-	@$(MAKE)
-	mkdir -p ${DESTDIR}${libdir}
-	if test -f .libs/qosdplugin.so; then cp .libs/qosdplugin.so ${DESTDIR}${libdir}; fi
-	if test -f .libs/qosdplugin.dll; then cp .libs/qosdplugin.dll ${DESTDIR}${libdir}; fi
diff --git a/src/plugin.c b/src/plugin.c
index 2757169..8c0d788 100644
--- a/src/plugin.c
+++ b/src/plugin.c
@@ -2,6 +2,7 @@
 #include <string.h>
 #include <glib.h>
 #include <gmpc/plugin.h>
+#include <config.h>
 #define QOSD_SONG_MARKUP "[[<span size=\"large\">♪ %title% ♪</span>\n]<span size=\"x-small\">[<i>artist:</i> %artist% ][<i>album:</i> %album%]</span>]|[%name%]|[%shortfile%]"
 
 
@@ -21,20 +22,13 @@ gmpcPrefPlugin qosd_gpp = {
 int plugin_api_version = PLUGIN_API_VERSION;
 /* main plugin_osd info */
 gmpcPlugin plugin = {
-	"Qball's On Screen Display",
-	{0,15,0},
-	GMPC_PLUGIN_NO_GUI,
-	0,
-	NULL, 
-	NULL,/*init */ 
-        NULL, /* Destroy */
-	NULL,
-	&qosd_mpd_status_changed,
-	NULL,
-	&qosd_gpp,
-	NULL,/* metadata */
-	qosd_get_enabled,
-	qosd_set_enabled	
+	.name           = "Qball's On Screen Display",
+	.version        = {PLUGIN_MAJOR_VERSION,PLUGIN_MINOR_VERSION,PLUGIN_MICRO_VERSION},
+	.plugin_type    = GMPC_PLUGIN_NO_GUI,
+	.mpd_status_changed = &qosd_mpd_status_changed,
+	.pref           = &qosd_gpp,
+	.get_enabled    = qosd_get_enabled,
+	.set_enabled    = qosd_set_enabled	
 };
 
 
-- 
2.11.4.GIT