Only xine? why?
Torgil Svensson
torgil.svensson at gmail.com
Sat Aug 19 18:39:00 UTC 2006
I've tested compiling with GStreamer engine and it seems to work fine.
Please apply attached patches so that people can test this during the
beta session. A few features (f.i. crossfade) doesn't work but I see
no reason not to enable this.
Why is "HTTP Proxy for Streaming" and "Audio CD Configuration"
settings grouped under the Xine engine?
On 6/11/06, Jocke Andersson <ajocke at gmail.com> wrote:
> On Sunday June 11 2006 11:09, Torgil Svensson wrote:
> > Hi amarok-list
> >
> > > gstreamer had an upgrade and there was nobody to port the changes in
> > > Amarok.
> >
> > Is there anyone here looking at this?
>
> Yes. Paul "foreboy" Cifarelli is working on the gst 0.10 engine. He's also the
> one who made the Helix engine.
>
> //Firetech
> _______________________________________________
> Amarok mailing list
> Amarok at kde.org
> https://mail.kde.org/mailman/listinfo/amarok
>
-------------- next part --------------
From b8c5b7d03aa9bf1a62be5ef461f50eecb751702e Mon Sep 17 00:00:00 2001
From: Torgil Svensson <torgil.svensson at gmail.com>
Date: Sun, 7 Aug 2005 00:00:00 +0200
Subject: [PATCH] Revert "Disable gst engine for 1.4.1."
This reverts commit e40be4a69ed3544fd97f9af8d36ff6bef78476b1.
---
README | 4 +
configure.in.bot | 36 +++++-----
configure.in.in | 70 ++++++++++----------
release_scripts/release_amarok.rb | 2 -
src/engine/Makefile.am | 9 +--
src/engine/gst10/amarok_gst10engine_plugin.desktop | 3 +
6 files changed, 65 insertions(+), 59 deletions(-)
diff --git a/README b/README
index b16980f..1555e38 100644
--- a/README
+++ b/README
@@ -65,6 +65,10 @@ Optional
http://www.real.com
(Note: only HelixPlayer is exactly RealPlayer without MP3 support)
+ * GStreamer-0.10 + GStreamer-Plugins-0.10
+ (multimedia framework)
+ http://gstreamer.net
+
* NMM 0.7.0
(multimedia framework)
http://www.networkmultimedia.org
diff --git a/configure.in.bot b/configure.in.bot
index 0c34208..95eaf20 100644
--- a/configure.in.bot
+++ b/configure.in.bot
@@ -78,18 +78,18 @@ if test x$build_xine = xno; then
echo " ="
fi
-#if test x$have_gst_plugins = xno -a x$have_gst = xyes; then
-# echo " =========================="
-# echo " === Amarok - WARNING ========================================================"
-# echo " =========================="
-# echo " ="
-# echo " = No GStreamer plugins were detected!"
-# echo " = Without plugins you will not be able to play any media using the"
-# echo " = GStreamer-engine! You need at least the MP3 plugin and a sink plugin, (eg."
-# echo " = ALSAsink). Please refer to http://gstreamer.freedesktop.org/"
-# echo " = NOTE: you will still be able to play media with another engine plugin."
-# echo " ="
-#fi
+if test x$have_gst_plugins = xno -a x$have_gst = xyes; then
+ echo " =========================="
+ echo " === Amarok - WARNING ========================================================"
+ echo " =========================="
+ echo " ="
+ echo " = No GStreamer plugins were detected!"
+ echo " = Without plugins you will not be able to play any media using the"
+ echo " = GStreamer-engine! You need at least the MP3 plugin and a sink plugin, (eg."
+ echo " = ALSAsink). Please refer to http://gstreamer.freedesktop.org/"
+ echo " = NOTE: you will still be able to play media with another engine plugin."
+ echo " ="
+fi
if test x$included_sqlite = xno; then
if test x$have_sqlite = xyes; then
@@ -173,9 +173,9 @@ # if test x$build_akode != xyes; then
# echo " = - aKode-engine"
# fi
-# if test x$have_gst10 != xyes; then
-# echo " = - GStreamer0.10-engine"
-# fi
+ if test x$have_gst10 != xyes; then
+ echo " = - GStreamer0.10-engine"
+ fi
if test x$build_xine != xyes; then
echo " = - xine-engine"
@@ -245,9 +245,9 @@ # if test x$build_akode = xyes; then
# echo " = + aKode-engine"
# fi
-# if test x$have_gst10 = xyes; then
-# echo " = + GStreamer0.10-engine"
-# fi
+ if test x$have_gst10 = xyes; then
+ echo " = + GStreamer0.10-engine"
+ fi
if test x$build_xine = xyes; then
echo " = + xine-engine"
diff --git a/configure.in.in b/configure.in.in
index e2b20da..6b8ed0b 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -70,41 +70,41 @@ ########################################
# BEGIN GSTREAMER-0.10 CHECK
###############################################################################
-#AC_ARG_WITH(gstreamer10,
-# AC_HELP_STRING([--with-gstreamer10],[build Amarok with GStreamer 0.10-engine]),
-# [build_gstreamer10=$withval],
-# [build_gstreamer10=no]
-#)
-#
-#if test "$build_gstreamer10" != "no"; then
-# if test "$PKGCONFIGFOUND" = "yes" ; then
-# # check for GStreamer
-# dnl Now we're ready to ask for gstreamer libs and cflags
-# dnl And we can also ask for the right version of gstreamer
-# have_gst10=no
-#
-# GST10_MAJORMINOR=0.10
-# GST10_REQ=0.10.0
-#
-# PKG_CHECK_MODULES(GST10, gstreamer-$GST10_MAJORMINOR >= $GST10_REQ gstreamer-base-$GST10_MAJORMINOR,
-# have_gst10=yes,have_gst10=no)
-#
-# dnl Give error if we don't have gstreamer
-# if test "x$have_gst10" = "xno"; then
-# LIB_GST10=""
-# CFLAGS_GST10=""
-# else
-# LIB_GST10=$GST10_LIBS
-# CFLAGS_GST10=$GST10_CFLAGS
-# AC_SUBST(LIB_GST10)
-# AC_SUBST(CFLAGS_GST10)
-# AC_SUBST(GST10_MAJORMINOR)
-# AC_DEFINE(HAVE_GSTREAMER10, 1, [have GStreamer10])
-# fi
-# fi
-#fi
-#
-#AM_CONDITIONAL(with_gst10, [test x$have_gst10 = xyes])
+AC_ARG_WITH(gstreamer10,
+ AC_HELP_STRING([--with-gstreamer10],[build Amarok with GStreamer 0.10-engine]),
+ [build_gstreamer10=$withval],
+ [build_gstreamer10=no]
+)
+
+if test "$build_gstreamer10" != "no"; then
+ if test "$PKGCONFIGFOUND" = "yes" ; then
+ # check for GStreamer
+ dnl Now we're ready to ask for gstreamer libs and cflags
+ dnl And we can also ask for the right version of gstreamer
+ have_gst10=no
+
+ GST10_MAJORMINOR=0.10
+ GST10_REQ=0.10.0
+
+ PKG_CHECK_MODULES(GST10, gstreamer-$GST10_MAJORMINOR >= $GST10_REQ gstreamer-base-$GST10_MAJORMINOR,
+ have_gst10=yes,have_gst10=no)
+
+ dnl Give error if we don't have gstreamer
+ if test "x$have_gst10" = "xno"; then
+ LIB_GST10=""
+ CFLAGS_GST10=""
+ else
+ LIB_GST10=$GST10_LIBS
+ CFLAGS_GST10=$GST10_CFLAGS
+ AC_SUBST(LIB_GST10)
+ AC_SUBST(CFLAGS_GST10)
+ AC_SUBST(GST10_MAJORMINOR)
+ AC_DEFINE(HAVE_GSTREAMER10, 1, [have GStreamer10])
+ fi
+ fi
+fi
+
+AM_CONDITIONAL(with_gst10, [test x$have_gst10 = xyes])
###############################################################################
# END GSTREAMER-0.10 CHECK
diff --git a/release_scripts/release_amarok.rb b/release_scripts/release_amarok.rb
index 573c1e1..9873755 100755
--- a/release_scripts/release_amarok.rb
+++ b/release_scripts/release_amarok.rb
@@ -176,7 +176,7 @@ # Move some important files to the root
# This stuff doesn't belong in the tarball
`rm -rf src/scripts/rbot`
`rm -rf release_scripts`
-`rm -rf src/engine/gst10` #Removed for now
+# `rm -rf src/engine/gst10` #Removed for now
Dir.chdir( "src" )
diff --git a/src/engine/Makefile.am b/src/engine/Makefile.am
index ef4ea95..48960fb 100644
--- a/src/engine/Makefile.am
+++ b/src/engine/Makefile.am
@@ -1,6 +1,6 @@
-#if with_gst10
-# GST10_ENGINE_SUBDIR = gst10
-#endif
+if with_gst10
+ GST10_ENGINE_SUBDIR = gst10
+endif
if with_nmm
NMM_ENGINE_SUBDIR = nmm
@@ -19,5 +19,6 @@ SUBDIRS = . \
void \
$(XINE_ENGINE_SUBDIR) \
$(NMM_ENGINE_SUBDIR) \
- $(HELIX_ENGINE_SUBDIR)
+ $(HELIX_ENGINE_SUBDIR) \
+ $(GST10_ENGINE_SUBDIR)
diff --git a/src/engine/gst10/amarok_gst10engine_plugin.desktop b/src/engine/gst10/amarok_gst10engine_plugin.desktop
index 237a781..156fe39 100644
--- a/src/engine/gst10/amarok_gst10engine_plugin.desktop
+++ b/src/engine/gst10/amarok_gst10engine_plugin.desktop
@@ -70,7 +70,8 @@ X-KDE-Amarok-plugintype=engine
X-KDE-Amarok-name=gst10-engine
X-KDE-Amarok-authors=Mark Kretschmann,Jakub Stachowski,Paul Cifarelli
X-KDE-Amarok-email=markey at web.de,qbast at go2.pl,paul at cifarelli.net
-X-KDE-Amarok-rank=0
+X-KDE-Amarok-rank=100
X-KDE-Amarok-version=1
X-KDE-Amarok-framework-version=26
+
--
1.4.2.g55c3
-------------- next part --------------
From 8655c3eb450141202ba240de1bcf4bcf5b24626a Mon Sep 17 00:00:00 2001
From: Torgil Svensson <torgil.svensson at gmail.com>
Date: Sun, 7 Aug 2005 00:00:00 +0200
Subject: [PATCH] Compile gstreamer0.10 engine by default
---
configure.in.in | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/configure.in.in b/configure.in.in
index 6b8ed0b..e3ac3b8 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -73,7 +73,7 @@ ########################################
AC_ARG_WITH(gstreamer10,
AC_HELP_STRING([--with-gstreamer10],[build Amarok with GStreamer 0.10-engine]),
[build_gstreamer10=$withval],
- [build_gstreamer10=no]
+ [build_gstreamer10=yes]
)
if test "$build_gstreamer10" != "no"; then
--
1.4.2.g55c3
More information about the Amarok
mailing list