Fixed Bug: 6438: Plugin makes background music stop on lock screen.

The only solution to fix this problem was rename back MAFW GStreamer
renderer from mafw-gst-subtitles-renderer to mafw-gst-renderer.

diff --git a/debian/control b/debian/control
index 8917cca..9fb6268 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -21,6 +21,7 @@ Package: mafw-gst-subtitles-renderer
 Section: libs
 Architecture: any
 Depends: gconf2, ${shlibs:Depends}, ${misc:Depends}, gstreamer0.10-plugins-base-subtitles (>= 0.10.25-0maemo14+0m5-1)
+Replaces: mafw-gst-renderer
 Description: MAFW gst renderer plugin with subtitles support
  Renderer plugin for MAFW-gst
 

diff --git a/debian/mafw-gst-renderer.mafw.xsession b/debian/mafw-gst-renderer.mafw.xsession
new file mode 100644 (file)
index 0000000..88fb03c
--- /dev/null
+++ b/debian/mafw-gst-renderer.mafw.xsession
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+if test -x /usr/sbin/dsmetool; then
+       sudo /usr/bin/mafw.sh start mafw-gst-renderer -7
+fi

diff --git a/debian/mafw-gst-subtitles-renderer.dirs b/debian/mafw-gst-subtitles-renderer.dirs
index a37ff89..db72179 100644 (file)
--- a/debian/mafw-gst-subtitles-renderer.dirs
+++ b/debian/mafw-gst-subtitles-renderer.dirs
@@ -1,2 +1 @@
 usr/lib/mafw-plugin
-etc/X11/Xsession.post
\ No newline at end of file

diff --git a/debian/mafw-gst-subtitles-renderer.mafw.xsession b/debian/mafw-gst-subtitles-renderer.mafw.xsession
deleted file mode 100644 (file)
index 7bcf082..0000000
--- a/debian/mafw-gst-subtitles-renderer.mafw.xsession
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-if test -x /usr/sbin/dsmetool; then
-       sudo /usr/bin/mafw.sh start mafw-gst-subtitles-renderer -7
-fi

diff --git a/debian/mafw-gst-subtitles-renderer.postinst b/debian/mafw-gst-subtitles-renderer.postinst
index bf982d9..896525f 100644 (file)
--- a/debian/mafw-gst-subtitles-renderer.postinst
+++ b/debian/mafw-gst-subtitles-renderer.postinst
@@ -2,11 +2,11 @@
 
 #DEBHELPER#
 
-if [ -f /etc/X11/Xsession.post/32mafw-gst-renderer ]; then
-       /usr/bin/mafw.sh stop mafw-gst-renderer
-       mv -f /etc/X11/Xsession.post/32mafw-gst-renderer /etc/X11/Xsession.post/32mafw-gst-renderer.removed
+# purge old installed startup script
+if [ -f /etc/X11/Xsession.post/31mafw-gst-subtitles-renderer ]; then
+       rm -f /etc/X11/Xsession.post/31mafw-gst-subtitles-renderer
 fi
 
-/usr/bin/mafw.sh start mafw-gst-subtitles-renderer -7
+/usr/bin/mafw.sh start mafw-gst-renderer -7
 
 exit 0

diff --git a/debian/mafw-gst-subtitles-renderer.postrm b/debian/mafw-gst-subtitles-renderer.postrm
new file mode 100644 (file)
index 0000000..003e7ec
--- /dev/null
+++ b/debian/mafw-gst-subtitles-renderer.postrm
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+#DEBHELPER#
+
+case "$1" in
+       remove)
+           # restore original mafw-gst-renderer on package removal
+           if [ -f /usr/lib/mafw-plugin/mafw-gst-renderer.so.removed ]; then
+               mv -f /usr/lib/mafw-plugin/mafw-gst-renderer.so.removed /usr/lib/mafw-plugin/mafw-gst-renderer.so
+           fi
+       ;;
+       abort-upgrade|abort-remove|abort-deconfigure)
+       ;;
+       *)
+       exit 0
+esac
+
+/usr/bin/mafw.sh start mafw-gst-renderer -7
+
+exit 0

diff --git a/debian/mafw-gst-subtitles-renderer.preinst b/debian/mafw-gst-subtitles-renderer.preinst
new file mode 100644 (file)
index 0000000..ede9601
--- /dev/null
+++ b/debian/mafw-gst-subtitles-renderer.preinst
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+#DEBHELPER#
+
+# create backup of original mafw-gst-renderer.so if it not exists
+if [ ! -f /usr/lib/mafw-plugin/mafw-gst-renderer.so.removed ]; then
+       /usr/bin/mafw.sh stop mafw-gst-renderer
+       mv -f /usr/lib/mafw-plugin/mafw-gst-renderer.so /usr/lib/mafw-plugin/mafw-gst-renderer.so.removed
+fi
+
+exit 0

diff --git a/debian/mafw-gst-subtitles-renderer.prerm b/debian/mafw-gst-subtitles-renderer.prerm
index f132ebd..f8abba6 100644 (file)
--- a/debian/mafw-gst-subtitles-renderer.prerm
+++ b/debian/mafw-gst-subtitles-renderer.prerm
@@ -2,11 +2,6 @@
 
 #DEBHELPER#
 
-/usr/bin/mafw.sh stop mafw-gst-subtitles-renderer
-
-if [ -f /etc/X11/Xsession.post/32mafw-gst-renderer.removed ]; then
-       /usr/bin/mafw.sh start mafw-gst-renderer -7
-       mv -f /etc/X11/Xsession.post/32mafw-gst-renderer.removed /etc/X11/Xsession.post/32mafw-gst-renderer
-fi
+/usr/bin/mafw.sh stop mafw-gst-renderer
 
 exit 0

diff --git a/debian/rules b/debian/rules
index 478c03d..15c86ec 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -71,8 +71,6 @@ binary-arch: build install
        dh_installchangelogs ChangeLog
        dh_installdocs
        dh_install --sourcedir=debian/tmp -v
-       install debian/mafw-gst-subtitles-renderer.mafw.xsession \
-               debian/mafw-gst-subtitles-renderer/etc/X11/Xsession.post/31mafw-gst-subtitles-renderer
        dh_link
        dh_strip --dbg-package=mafw-gst-subtitles-renderer
        dh_compress

diff --git a/libmafw-gst-renderer/Makefile.am b/libmafw-gst-renderer/Makefile.am
index 3cc2ac5..adc18a3 100644 (file)
--- a/libmafw-gst-renderer/Makefile.am
+++ b/libmafw-gst-renderer/Makefile.am
@@ -5,40 +5,40 @@
 #
 # Copyright (C) 2007, 2008, 2009 Nokia. All rights reserved.
 
-plugin_LTLIBRARIES             = mafw-gst-subtitles-renderer.la
+plugin_LTLIBRARIES             = mafw-gst-renderer.la
 
 BUILT_SOURCES                  = mafw-gst-renderer-marshal.c \
                                  mafw-gst-renderer-marshal.h
 
-mafw_gst_subtitles_renderer_la_SOURCES = $(BUILT_SOURCES) \
-                                         keypad.c keypad.h \
-                                         blanking.c blanking.h \
-                                         mafw-gst-renderer.c mafw-gst-renderer.h \
-                                         mafw-gst-renderer-utils.c mafw-gst-renderer-utils.h \
-                                         mafw-gst-renderer-worker.c mafw-gst-renderer-worker.h \
-                                         mafw-gst-renderer-worker-volume.c mafw-gst-renderer-worker-volume.h \
-                                         mafw-gst-renderer-state.c mafw-gst-renderer-state.h \
-                                         mafw-gst-renderer-state-playing.c mafw-gst-renderer-state-playing.h \
-                                         mafw-gst-renderer-state-paused.c mafw-gst-renderer-state-paused.h \
-                                         mafw-gst-renderer-state-stopped.c mafw-gst-renderer-state-stopped.h \
-                                         mafw-gst-renderer-state-transitioning.c mafw-gst-renderer-state-transitioning.h \
-                                         mafw-playlist-iterator.c mafw-playlist-iterator.h
-
-mafw_gst_subtitles_renderer_la_CPPFLAGS        = $(DEPS_CFLAGS) $(VOLUME_CFLAGS) \
+mafw_gst_renderer_la_SOURCES   = $(BUILT_SOURCES) \
+                                 keypad.c keypad.h \
+                                 blanking.c blanking.h \
+                                 mafw-gst-renderer.c mafw-gst-renderer.h \
+                                 mafw-gst-renderer-utils.c mafw-gst-renderer-utils.h \
+                                 mafw-gst-renderer-worker.c mafw-gst-renderer-worker.h \
+                                 mafw-gst-renderer-worker-volume.c mafw-gst-renderer-worker-volume.h \
+                                 mafw-gst-renderer-state.c mafw-gst-renderer-state.h \
+                                 mafw-gst-renderer-state-playing.c mafw-gst-renderer-state-playing.h \
+                                 mafw-gst-renderer-state-paused.c mafw-gst-renderer-state-paused.h \
+                                 mafw-gst-renderer-state-stopped.c mafw-gst-renderer-state-stopped.h \
+                                 mafw-gst-renderer-state-transitioning.c mafw-gst-renderer-state-transitioning.h \
+                                 mafw-playlist-iterator.c mafw-playlist-iterator.h
+
+mafw_gst_renderer_la_CPPFLAGS  = $(DEPS_CFLAGS) $(VOLUME_CFLAGS) \
                                  -DPREFIX=\"$(prefix)\" $(_CFLAGS)
-mafw_gst_subtitles_renderer_la_LDFLAGS = -avoid-version -module $(_LDFLAGS)
-mafw_gst_subtitles_renderer_la_LIBADD  = $(DEPS_LIBS) $(VOLUME_LIBS) \
+mafw_gst_renderer_la_LDFLAGS   = -avoid-version -module $(_LDFLAGS)
+mafw_gst_renderer_la_LIBADD    = $(DEPS_LIBS) $(VOLUME_LIBS) \
                                  -lgstinterfaces-0.10 -lgstpbutils-0.10
 
 if HAVE_GDKPIXBUF
-mafw_gst_subtitles_renderer_la_SOURCES += gstscreenshot.c gstscreenshot.h
-mafw_gst_subtitles_renderer_la_CPPFLAGS += $(GDKPIXBUF_CFLAGS)
-mafw_gst_subtitles_renderer_la_LIBADD += $(GDKPIXBUF_LIBS)
+mafw_gst_renderer_la_SOURCES += gstscreenshot.c gstscreenshot.h
+mafw_gst_renderer_la_CPPFLAGS += $(GDKPIXBUF_CFLAGS)
+mafw_gst_renderer_la_LIBADD += $(GDKPIXBUF_LIBS)
 endif
 
 if HAVE_CONIC
-mafw_gst_subtitles_renderer_la_CPPFLAGS += $(CONIC_CFLAGS)
-mafw_gst_subtitles_renderer_la_LIBADD += $(CONIC_LIBS)
+mafw_gst_renderer_la_CPPFLAGS += $(CONIC_CFLAGS)
+mafw_gst_renderer_la_LIBADD += $(CONIC_LIBS)
 endif
 
 mafw-gst-renderer-marshal.c: mafw-gst-renderer-marshal.list

diff --git a/libmafw-gst-renderer/mafw-gst-renderer.c b/libmafw-gst-renderer/mafw-gst-renderer.c
index 58d39c4..e92ea63 100644 (file)
--- a/libmafw-gst-renderer/mafw-gst-renderer.c
+++ b/libmafw-gst-renderer/mafw-gst-renderer.c
@@ -175,7 +175,7 @@ static void _connection_init(MafwGstRenderer *renderer);
  * Registers the plugin descriptor making this plugin available to the
  * framework and applications
  */
-G_MODULE_EXPORT MafwPluginDescriptor mafw_gst_subtitles_renderer_plugin_description = {
+G_MODULE_EXPORT MafwPluginDescriptor mafw_gst_renderer_plugin_description = {
        { .name         = MAFW_GST_RENDERER_PLUGIN_NAME },
        .initialize     = mafw_gst_renderer_initialize,
        .deinitialize   = mafw_gst_renderer_deinitialize,