[banshee] build: move libbanshee inside the Banshee.GStreamer backend folder

From: Andrés Aragoneses <aaragoneses src gnome org>
To: commits-list gnome org
Cc:
Subject: [banshee] build: move libbanshee inside the Banshee.GStreamer backend folder
Date: Wed, 16 Oct 2013 08:50:09 +0000 (UTC)
commit 8d74cb97d9fd29cc47d628764e5205e2f3fad0dd
Author: Andrés G. Aragoneses <knocte gmail com>
Date:   Wed Oct 16 10:49:58 2013 +0200

    build: move libbanshee inside the Banshee.GStreamer backend folder
    
    In the same way libbnpx11 unmanaged lib is inside Banshee.NowPlaying.X11
    folder (the extension that depends on it), libbanshee is now being moved
    to the folder of the backend extension Banshee.GStreamer; which is
    currently the default, but may be just optional soonish (so we can
    make this conditional compilation easier too).

 Makefile.am                                        |    1 -
 build/m4/banshee/gstreamer.m4                      |    2 +
 configure.ac                                       |    6 +--
 .../Banshee.GStreamer/Banshee.GStreamer.csproj     |   32 ++++++++++++++++++++
 src/Backends/Banshee.GStreamer/Makefile.am         |    2 +
 .../Banshee.GStreamer/libbanshee}/Makefile.am      |    0
 .../libbanshee}/banshee-bpmdetector.c              |    0
 .../Banshee.GStreamer/libbanshee}/banshee-gst.c    |    0
 .../Banshee.GStreamer/libbanshee}/banshee-gst.h    |    0
 .../libbanshee}/banshee-player-cdda.c              |    0
 .../libbanshee}/banshee-player-cdda.h              |    0
 .../libbanshee}/banshee-player-dvd.c               |    0
 .../libbanshee}/banshee-player-dvd.h               |    0
 .../libbanshee}/banshee-player-equalizer.c         |    0
 .../libbanshee}/banshee-player-equalizer.h         |    0
 .../libbanshee}/banshee-player-missing-elements.c  |    0
 .../libbanshee}/banshee-player-missing-elements.h  |    0
 .../libbanshee}/banshee-player-pipeline.c          |    0
 .../libbanshee}/banshee-player-pipeline.h          |    0
 .../libbanshee}/banshee-player-private.h           |    0
 .../libbanshee}/banshee-player-replaygain.c        |    0
 .../libbanshee}/banshee-player-replaygain.h        |    0
 .../libbanshee}/banshee-player-video.c             |    0
 .../libbanshee}/banshee-player-video.h             |    0
 .../libbanshee}/banshee-player-vis.c               |    0
 .../libbanshee}/banshee-player-vis.h               |    0
 .../Banshee.GStreamer/libbanshee}/banshee-player.c |    0
 .../Banshee.GStreamer/libbanshee}/banshee-ripper.c |    0
 .../Banshee.GStreamer/libbanshee}/banshee-tagger.c |    0
 .../Banshee.GStreamer/libbanshee}/banshee-tagger.h |    0
 .../libbanshee}/banshee-transcoder.c               |    0
 .../libbanshee}/clutter-gst-shaders.h              |    0
 .../libbanshee}/clutter-gst-video-sink.c           |    0
 .../libbanshee}/clutter-gst-video-sink.h           |    0
 .../Banshee.GStreamer/libbanshee}/libbanshee.cproj |    0
 .../Banshee.GStreamer/libbanshee}/libbanshee.sln   |    0
 .../libbanshee}/libbanshee.vcproj                  |    0
 .../Banshee.GStreamer/libbanshee}/shaders/I420.h   |    0
 .../Banshee.GStreamer/libbanshee}/shaders/YV12.h   |    0
 39 files changed, 38 insertions(+), 5 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 7fc9ba1..db208fa 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,6 @@ SUBDIRS = \
        build \
        data \
        help \
-       libbanshee \
        src \
        docs \
        tests \
diff --git a/build/m4/banshee/gstreamer.m4 b/build/m4/banshee/gstreamer.m4
index 5bfc468..ec1f280 100644
--- a/build/m4/banshee/gstreamer.m4
+++ b/build/m4/banshee/gstreamer.m4
@@ -1,5 +1,7 @@
 AC_DEFUN([BANSHEE_CHECK_GSTREAMER],
 [
+       BANSHEE_CHECK_LIBBANSHEE
+
        GSTREAMER_REQUIRED_VERSION=1.0.0
        AC_SUBST(GSTREAMER_REQUIRED_VERSION)
 
diff --git a/configure.ac b/configure.ac
index 2465c59..47d8db4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -53,8 +53,7 @@ SHAMROCK_EXPAND_DATADIR
 
 PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.22)
 
-dnl libbanshee/native dependencies (required)
-BANSHEE_CHECK_LIBBANSHEE
+dnl Default media backend, libbanshee/native dependencies
 BANSHEE_CHECK_GSTREAMER
 
 dnl For the new media backend using gstreamer-sharp
@@ -245,8 +244,6 @@ tests/Performance/Makefile
 
 extras/Makefile
 
-libbanshee/Makefile
-
 src/Hyena/Makefile
 src/Hyena/build/Makefile
 src/Hyena/build/pkg-config/Makefile
@@ -281,6 +278,7 @@ src/Backends/Makefile
 src/Backends/Banshee.Gio/Makefile
 src/Backends/Banshee.Gnome/Makefile
 src/Backends/Banshee.GStreamer/Makefile
+src/Backends/Banshee.GStreamer/libbanshee/Makefile
 src/Backends/Banshee.GStreamerSharp/Makefile
 src/Backends/Banshee.Unix/Makefile
 src/Backends/Banshee.Osx/Makefile
diff --git a/src/Backends/Banshee.GStreamer/Banshee.GStreamer.csproj 
b/src/Backends/Banshee.GStreamer/Banshee.GStreamer.csproj
index 60e204f..ea5faad 100644
--- a/src/Backends/Banshee.GStreamer/Banshee.GStreamer.csproj
+++ b/src/Backends/Banshee.GStreamer/Banshee.GStreamer.csproj
@@ -93,4 +93,36 @@
       </Properties>
     </MonoDevelop>
   </ProjectExtensions>
+  <ItemGroup>
+    <None Include="libbanshee\banshee-bpmdetector.c" />
+    <None Include="libbanshee\banshee-gst.c" />
+    <None Include="libbanshee\banshee-player.c" />
+    <None Include="libbanshee\banshee-player-cdda.c" />
+    <None Include="libbanshee\banshee-player-cdda.h" />
+    <None Include="libbanshee\banshee-gst.h" />
+    <None Include="libbanshee\banshee-player-dvd.c" />
+    <None Include="libbanshee\banshee-player-dvd.h" />
+    <None Include="libbanshee\banshee-player-equalizer.c" />
+    <None Include="libbanshee\banshee-player-equalizer.h" />
+    <None Include="libbanshee\banshee-player-missing-elements.c" />
+    <None Include="libbanshee\banshee-player-missing-elements.h" />
+    <None Include="libbanshee\banshee-player-pipeline.c" />
+    <None Include="libbanshee\banshee-player-pipeline.h" />
+    <None Include="libbanshee\banshee-player-private.h" />
+    <None Include="libbanshee\banshee-player-replaygain.c" />
+    <None Include="libbanshee\banshee-player-replaygain.h" />
+    <None Include="libbanshee\banshee-player-video.c" />
+    <None Include="libbanshee\banshee-player-video.h" />
+    <None Include="libbanshee\banshee-player-vis.c" />
+    <None Include="libbanshee\banshee-player-vis.h" />
+    <None Include="libbanshee\banshee-ripper.c" />
+    <None Include="libbanshee\banshee-tagger.c" />
+    <None Include="libbanshee\banshee-tagger.h" />
+    <None Include="libbanshee\banshee-transcoder.c" />
+    <None Include="libbanshee\clutter-gst-shaders.h" />
+    <None Include="libbanshee\clutter-gst-video-sink.c" />
+    <None Include="libbanshee\clutter-gst-video-sink.h" />
+    <None Include="libbanshee\shaders\I420.h" />
+    <None Include="libbanshee\shaders\YV12.h" />
+  </ItemGroup>
 </Project>
diff --git a/src/Backends/Banshee.GStreamer/Makefile.am b/src/Backends/Banshee.GStreamer/Makefile.am
index 321b270..6c44757 100644
--- a/src/Backends/Banshee.GStreamer/Makefile.am
+++ b/src/Backends/Banshee.GStreamer/Makefile.am
@@ -1,3 +1,5 @@
+SUBDIRS = libbanshee
+
 ASSEMBLY = Banshee.GStreamer
 TARGET = library
 LINK = $(REF_BACKEND_GSTREAMER)
diff --git a/libbanshee/Makefile.am b/src/Backends/Banshee.GStreamer/libbanshee/Makefile.am
similarity index 100%
rename from libbanshee/Makefile.am
rename to src/Backends/Banshee.GStreamer/libbanshee/Makefile.am
diff --git a/libbanshee/banshee-bpmdetector.c 
b/src/Backends/Banshee.GStreamer/libbanshee/banshee-bpmdetector.c
similarity index 100%
rename from libbanshee/banshee-bpmdetector.c
rename to src/Backends/Banshee.GStreamer/libbanshee/banshee-bpmdetector.c
diff --git a/libbanshee/banshee-gst.c b/src/Backends/Banshee.GStreamer/libbanshee/banshee-gst.c
similarity index 100%
rename from libbanshee/banshee-gst.c
rename to src/Backends/Banshee.GStreamer/libbanshee/banshee-gst.c
diff --git a/libbanshee/banshee-gst.h b/src/Backends/Banshee.GStreamer/libbanshee/banshee-gst.h
similarity index 100%
rename from libbanshee/banshee-gst.h
rename to src/Backends/Banshee.GStreamer/libbanshee/banshee-gst.h
diff --git a/libbanshee/banshee-player-cdda.c 
b/src/Backends/Banshee.GStreamer/libbanshee/banshee-player-cdda.c
similarity index 100%
rename from libbanshee/banshee-player-cdda.c
rename to src/Backends/Banshee.GStreamer/libbanshee/banshee-player-cdda.c
diff --git a/libbanshee/banshee-player-cdda.h 
b/src/Backends/Banshee.GStreamer/libbanshee/banshee-player-cdda.h
similarity index 100%
rename from libbanshee/banshee-player-cdda.h
rename to src/Backends/Banshee.GStreamer/libbanshee/banshee-player-cdda.h
diff --git a/libbanshee/banshee-player-dvd.c b/src/Backends/Banshee.GStreamer/libbanshee/banshee-player-dvd.c
similarity index 100%
rename from libbanshee/banshee-player-dvd.c
rename to src/Backends/Banshee.GStreamer/libbanshee/banshee-player-dvd.c
diff --git a/libbanshee/banshee-player-dvd.h b/src/Backends/Banshee.GStreamer/libbanshee/banshee-player-dvd.h
similarity index 100%
rename from libbanshee/banshee-player-dvd.h
rename to src/Backends/Banshee.GStreamer/libbanshee/banshee-player-dvd.h
diff --git a/libbanshee/banshee-player-equalizer.c 
b/src/Backends/Banshee.GStreamer/libbanshee/banshee-player-equalizer.c
similarity index 100%
rename from libbanshee/banshee-player-equalizer.c
rename to src/Backends/Banshee.GStreamer/libbanshee/banshee-player-equalizer.c
diff --git a/libbanshee/banshee-player-equalizer.h 
b/src/Backends/Banshee.GStreamer/libbanshee/banshee-player-equalizer.h
similarity index 100%
rename from libbanshee/banshee-player-equalizer.h
rename to src/Backends/Banshee.GStreamer/libbanshee/banshee-player-equalizer.h
diff --git a/libbanshee/banshee-player-missing-elements.c 
b/src/Backends/Banshee.GStreamer/libbanshee/banshee-player-missing-elements.c
similarity index 100%
rename from libbanshee/banshee-player-missing-elements.c
rename to src/Backends/Banshee.GStreamer/libbanshee/banshee-player-missing-elements.c
diff --git a/libbanshee/banshee-player-missing-elements.h 
b/src/Backends/Banshee.GStreamer/libbanshee/banshee-player-missing-elements.h
similarity index 100%
rename from libbanshee/banshee-player-missing-elements.h
rename to src/Backends/Banshee.GStreamer/libbanshee/banshee-player-missing-elements.h
diff --git a/libbanshee/banshee-player-pipeline.c 
b/src/Backends/Banshee.GStreamer/libbanshee/banshee-player-pipeline.c
similarity index 100%
rename from libbanshee/banshee-player-pipeline.c
rename to src/Backends/Banshee.GStreamer/libbanshee/banshee-player-pipeline.c
diff --git a/libbanshee/banshee-player-pipeline.h 
b/src/Backends/Banshee.GStreamer/libbanshee/banshee-player-pipeline.h
similarity index 100%
rename from libbanshee/banshee-player-pipeline.h
rename to src/Backends/Banshee.GStreamer/libbanshee/banshee-player-pipeline.h
diff --git a/libbanshee/banshee-player-private.h 
b/src/Backends/Banshee.GStreamer/libbanshee/banshee-player-private.h
similarity index 100%
rename from libbanshee/banshee-player-private.h
rename to src/Backends/Banshee.GStreamer/libbanshee/banshee-player-private.h
diff --git a/libbanshee/banshee-player-replaygain.c 
b/src/Backends/Banshee.GStreamer/libbanshee/banshee-player-replaygain.c
similarity index 100%
rename from libbanshee/banshee-player-replaygain.c
rename to src/Backends/Banshee.GStreamer/libbanshee/banshee-player-replaygain.c
diff --git a/libbanshee/banshee-player-replaygain.h 
b/src/Backends/Banshee.GStreamer/libbanshee/banshee-player-replaygain.h
similarity index 100%
rename from libbanshee/banshee-player-replaygain.h
rename to src/Backends/Banshee.GStreamer/libbanshee/banshee-player-replaygain.h
diff --git a/libbanshee/banshee-player-video.c 
b/src/Backends/Banshee.GStreamer/libbanshee/banshee-player-video.c
similarity index 100%
rename from libbanshee/banshee-player-video.c
rename to src/Backends/Banshee.GStreamer/libbanshee/banshee-player-video.c
diff --git a/libbanshee/banshee-player-video.h 
b/src/Backends/Banshee.GStreamer/libbanshee/banshee-player-video.h
similarity index 100%
rename from libbanshee/banshee-player-video.h
rename to src/Backends/Banshee.GStreamer/libbanshee/banshee-player-video.h
diff --git a/libbanshee/banshee-player-vis.c b/src/Backends/Banshee.GStreamer/libbanshee/banshee-player-vis.c
similarity index 100%
rename from libbanshee/banshee-player-vis.c
rename to src/Backends/Banshee.GStreamer/libbanshee/banshee-player-vis.c
diff --git a/libbanshee/banshee-player-vis.h b/src/Backends/Banshee.GStreamer/libbanshee/banshee-player-vis.h
similarity index 100%
rename from libbanshee/banshee-player-vis.h
rename to src/Backends/Banshee.GStreamer/libbanshee/banshee-player-vis.h
diff --git a/libbanshee/banshee-player.c b/src/Backends/Banshee.GStreamer/libbanshee/banshee-player.c
similarity index 100%
rename from libbanshee/banshee-player.c
rename to src/Backends/Banshee.GStreamer/libbanshee/banshee-player.c
diff --git a/libbanshee/banshee-ripper.c b/src/Backends/Banshee.GStreamer/libbanshee/banshee-ripper.c
similarity index 100%
rename from libbanshee/banshee-ripper.c
rename to src/Backends/Banshee.GStreamer/libbanshee/banshee-ripper.c
diff --git a/libbanshee/banshee-tagger.c b/src/Backends/Banshee.GStreamer/libbanshee/banshee-tagger.c
similarity index 100%
rename from libbanshee/banshee-tagger.c
rename to src/Backends/Banshee.GStreamer/libbanshee/banshee-tagger.c
diff --git a/libbanshee/banshee-tagger.h b/src/Backends/Banshee.GStreamer/libbanshee/banshee-tagger.h
similarity index 100%
rename from libbanshee/banshee-tagger.h
rename to src/Backends/Banshee.GStreamer/libbanshee/banshee-tagger.h
diff --git a/libbanshee/banshee-transcoder.c b/src/Backends/Banshee.GStreamer/libbanshee/banshee-transcoder.c
similarity index 100%
rename from libbanshee/banshee-transcoder.c
rename to src/Backends/Banshee.GStreamer/libbanshee/banshee-transcoder.c
diff --git a/libbanshee/clutter-gst-shaders.h 
b/src/Backends/Banshee.GStreamer/libbanshee/clutter-gst-shaders.h
similarity index 100%
rename from libbanshee/clutter-gst-shaders.h
rename to src/Backends/Banshee.GStreamer/libbanshee/clutter-gst-shaders.h
diff --git a/libbanshee/clutter-gst-video-sink.c 
b/src/Backends/Banshee.GStreamer/libbanshee/clutter-gst-video-sink.c
similarity index 100%
rename from libbanshee/clutter-gst-video-sink.c
rename to src/Backends/Banshee.GStreamer/libbanshee/clutter-gst-video-sink.c
diff --git a/libbanshee/clutter-gst-video-sink.h 
b/src/Backends/Banshee.GStreamer/libbanshee/clutter-gst-video-sink.h
similarity index 100%
rename from libbanshee/clutter-gst-video-sink.h
rename to src/Backends/Banshee.GStreamer/libbanshee/clutter-gst-video-sink.h
diff --git a/libbanshee/libbanshee.cproj b/src/Backends/Banshee.GStreamer/libbanshee/libbanshee.cproj
similarity index 100%
rename from libbanshee/libbanshee.cproj
rename to src/Backends/Banshee.GStreamer/libbanshee/libbanshee.cproj
diff --git a/libbanshee/libbanshee.sln b/src/Backends/Banshee.GStreamer/libbanshee/libbanshee.sln
similarity index 100%
rename from libbanshee/libbanshee.sln
rename to src/Backends/Banshee.GStreamer/libbanshee/libbanshee.sln
diff --git a/libbanshee/libbanshee.vcproj b/src/Backends/Banshee.GStreamer/libbanshee/libbanshee.vcproj
similarity index 100%
rename from libbanshee/libbanshee.vcproj
rename to src/Backends/Banshee.GStreamer/libbanshee/libbanshee.vcproj
diff --git a/libbanshee/shaders/I420.h b/src/Backends/Banshee.GStreamer/libbanshee/shaders/I420.h
similarity index 100%
rename from libbanshee/shaders/I420.h
rename to src/Backends/Banshee.GStreamer/libbanshee/shaders/I420.h
diff --git a/libbanshee/shaders/YV12.h b/src/Backends/Banshee.GStreamer/libbanshee/shaders/YV12.h
similarity index 100%
rename from libbanshee/shaders/YV12.h
rename to src/Backends/Banshee.GStreamer/libbanshee/shaders/YV12.h
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]