GNOME.org
 

banshee r3606 - in trunk/banshee: . build/m4/banshee libbanshee src/Libraries/MusicBrainz/MusicBrainz

Author: abock
Date: Mon Mar 31 03:08:12 2008
New Revision: 3606
URL: http://svn.gnome.org/viewvc/banshee?rev=3606&view=rev

Log:
2008-03-30  Aaron Bockover  <abock gnome org>

    * build/m4/banshee/gstreamer.m4: Link against CDDA base library

    * libbanshee/: Starting to reorganize some things, added an MD project

    * src/Libraries/MusicBrainz/MusicBrainz/MusicBrainzItem.cs:
    * src/Libraries/MusicBrainz/MusicBrainz/Release.cs:
    * src/Libraries/MusicBrainz/MusicBrainz/Track.cs: Fix synced from
    main repository



Added:
   trunk/banshee/libbanshee/banshee-player.c
      - copied unchanged from r3603, /trunk/banshee/libbanshee/gst-playback-0.10.c
   trunk/banshee/libbanshee/libbanshee.mdp
   trunk/banshee/src/Libraries/MusicBrainz/MusicBrainz/sync.sh   (contents, props changed)
Removed:
   trunk/banshee/libbanshee/gst-playback-0.10.c
   trunk/banshee/libbanshee/gst-playback.h
Modified:
   trunk/banshee/Banshee.mds
   trunk/banshee/ChangeLog
   trunk/banshee/build/m4/banshee/gstreamer.m4
   trunk/banshee/libbanshee/Makefile.am
   trunk/banshee/src/Libraries/MusicBrainz/MusicBrainz/MusicBrainzItem.cs
   trunk/banshee/src/Libraries/MusicBrainz/MusicBrainz/Release.cs
   trunk/banshee/src/Libraries/MusicBrainz/MusicBrainz/Track.cs

Modified: trunk/banshee/Banshee.mds
==============================================================================
--- trunk/banshee/Banshee.mds	(original)
+++ trunk/banshee/Banshee.mds	Mon Mar 31 03:08:12 2008
@@ -3,13 +3,16 @@
     <Configuration name="Debug" ctype="CombineConfiguration">
       <Entry build="True" name="Banshee" configuration="Debug" />
       <Entry build="True" configuration="Default" />
+      <Entry build="True" name="libbanshee" configuration="Debug" />
     </Configuration>
   </Configurations>
   <StartMode startupentry="Banshee" single="True">
     <Execute type="None" entry="Banshee" />
     <Execute type="None" entry="tests" />
+    <Execute type="None" entry="libbanshee" />
   </StartMode>
   <Entries>
     <Entry filename="src/Banshee.mds" />
+    <Entry filename="libbanshee/libbanshee.mdp" />
   </Entries>
 </Combine>
\ No newline at end of file

Modified: trunk/banshee/build/m4/banshee/gstreamer.m4
==============================================================================
--- trunk/banshee/build/m4/banshee/gstreamer.m4	(original)
+++ trunk/banshee/build/m4/banshee/gstreamer.m4	Mon Mar 31 03:08:12 2008
@@ -10,7 +10,7 @@
 		gstreamer-controller-0.10 >= $GSTREAMER_REQUIRED_VERSION
 		gstreamer-dataprotocol-0.10 >= $GSTREAMER_REQUIRED_VERSION)
 
-	GST_LIBS="$GST_LIBS -lgstvideo-0.10 -lgstinterfaces-0.10"
+	GST_LIBS="$GST_LIBS -lgstvideo-0.10 -lgstinterfaces-0.10 -lgstcdda-0.10"
 
 	PKG_CHECK_MODULES(GST_PBUTILS, gstreamer-plugins-base-0.10 >= 0.10.12, 
 		gst_pbutils=yes, gst_pbutils=no)

Modified: trunk/banshee/libbanshee/Makefile.am
==============================================================================
--- trunk/banshee/libbanshee/Makefile.am	(original)
+++ trunk/banshee/libbanshee/Makefile.am	Mon Mar 31 03:08:12 2008
@@ -11,17 +11,13 @@
 bansheelib_LTLIBRARIES = libbanshee.la
 
 libbanshee_la_LDFLAGS = -avoid-version -module
-libbanshee_la_SOURCES = \
+libbanshee_la_SOURCES =  \
+	banshee-player.c \
+	gst-cd-rip-0.10.c \
+	gst-misc-0.10.c \
 	gst-playback.h \
-	gst-misc.h \
-	gst-transcode.h \
-	gst-cd-rip.h \
 	gst-tagger.c \
-	gst-tagger.h \
-	gst-playback-0.10.c \
-	gst-misc-0.10.c \
-	gst-transcode-0.10.c \
-	gst-cd-rip-0.10.c
+	gst-transcode-0.10.c
 
 OLD_CODE = \
 	gst-mbtrm.h \

Added: trunk/banshee/libbanshee/libbanshee.mdp
==============================================================================
--- (empty file)
+++ trunk/banshee/libbanshee/libbanshee.mdp	Mon Mar 31 03:08:12 2008
@@ -0,0 +1,34 @@
+<Project name="libbanshee" fileversion="2.0" language="C" ctype="CProject">
+  <Configurations active="Debug">
+    <Configuration name="Debug" ctype="CProjectConfiguration">
+      <Output directory="../bin" output="libbanshee" />
+      <Build debugmode="True" target="SharedLibrary" />
+      <Execution runwithwarnings="True" consolepause="True" />
+      <CodeGeneration WarningLevel="Normal" WarningsAsErrors="False" OptimizationLevel="0" ExtraCompilerArguments="" ExtraLinkerArguments="" DefineSymbols="DEBUG MONODEVELOP" ctype="CCompilationParameters" />
+    </Configuration>
+  </Configurations>
+  <Contents>
+    <File name="." subtype="Directory" buildaction="Nothing" />
+    <File name="gst-cd-rip.h" subtype="Code" buildaction="Nothing" />
+    <File name="gst-cd-rip-0.10.c" subtype="Code" buildaction="Compile" />
+    <File name="gst-mbtrm.h" subtype="Code" buildaction="Nothing" />
+    <File name="gst-misc.h" subtype="Code" buildaction="Nothing" />
+    <File name="gst-misc-0.10.c" subtype="Code" buildaction="Compile" />
+    <File name="banshee-player.c" subtype="Code" buildaction="Compile" />
+    <File name="gst-tagger.c" subtype="Code" buildaction="Compile" />
+    <File name="gst-tagger.h" subtype="Code" buildaction="Nothing" />
+    <File name="gst-transcode.h" subtype="Code" buildaction="Nothing" />
+    <File name="gst-transcode-0.10.c" subtype="Code" buildaction="Compile" />
+  </Contents>
+  <compiler ctype="GccCompiler" />
+  <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="True" RelativeMakefileName="Makefile.am">
+    <BuildFilesVar Sync="True" Name="libbanshee_la_SOURCES" />
+    <DeployFilesVar />
+    <ResourcesVar />
+    <OthersVar />
+    <GacRefVar />
+    <AsmRefVar />
+    <ProjectRefVar />
+    <MessageRegex Name="gcc" />
+  </MonoDevelop.Autotools.MakefileInfo>
+</Project>
\ No newline at end of file

Modified: trunk/banshee/src/Libraries/MusicBrainz/MusicBrainz/MusicBrainzItem.cs
==============================================================================
--- trunk/banshee/src/Libraries/MusicBrainz/MusicBrainz/MusicBrainzItem.cs	(original)
+++ trunk/banshee/src/Libraries/MusicBrainz/MusicBrainz/MusicBrainzItem.cs	Mon Mar 31 03:08:12 2008
@@ -90,8 +90,9 @@
         {
         }
 
-        internal MusicBrainzItem (XmlReader reader, bool all_rels_loaded) : base (reader, all_rels_loaded)
+        internal MusicBrainzItem (XmlReader reader, Artist artist, bool all_rels_loaded) : base (reader, all_rels_loaded)
         {
+            if (this.artist == null) this.artist = artist;
         }
 
         protected override void HandleCreateInc (StringBuilder builder)

Modified: trunk/banshee/src/Libraries/MusicBrainz/MusicBrainz/Release.cs
==============================================================================
--- trunk/banshee/src/Libraries/MusicBrainz/MusicBrainz/Release.cs	(original)
+++ trunk/banshee/src/Libraries/MusicBrainz/MusicBrainz/Release.cs	Mon Mar 31 03:08:12 2008
@@ -137,16 +137,18 @@
         {
         }
 
-        internal Release (XmlReader reader) : base(reader, false)
+        internal Release (XmlReader reader) : base (reader, null, false)
         {
         }
         
+        static readonly string [] track_params = new string [] { "tracks", "track-level-rels", "artist" };
+        
         protected override void HandleCreateInc (StringBuilder builder)
         {
             AppendIncParameters (builder, "release-events", "labels");
             if (discs == null) AppendIncParameters (builder, "discs");
             if (tracks == null) {
-                AppendIncParameters (builder, "tracks", "track-level-rels");
+                AppendIncParameters (builder, track_params);
                 AllRelsLoaded = false;
             }
             base.HandleCreateInc (builder);
@@ -222,7 +224,7 @@
                         track_number = int.Parse (offset) + 1;
                     if (reader.ReadToDescendant ("track")) {
                         List<Track> tracks = new List<Track> ();
-                        do tracks.Add (new Track (reader.ReadSubtree (), AllDataLoaded));
+                        do tracks.Add (new Track (reader.ReadSubtree (), Artist, AllDataLoaded));
                         while (reader.ReadToNextSibling ("track"));
                         this.tracks = tracks.AsReadOnly ();
                     }

Modified: trunk/banshee/src/Libraries/MusicBrainz/MusicBrainz/Track.cs
==============================================================================
--- trunk/banshee/src/Libraries/MusicBrainz/MusicBrainz/Track.cs	(original)
+++ trunk/banshee/src/Libraries/MusicBrainz/MusicBrainz/Track.cs	Mon Mar 31 03:08:12 2008
@@ -90,11 +90,11 @@
         {
         }
 
-        internal Track (XmlReader reader) : base (reader, false)
+        internal Track (XmlReader reader) : base (reader, null, false)
         {
         }
 
-        internal Track (XmlReader reader, bool all_rels_loaded) : base (reader, all_rels_loaded)
+        internal Track (XmlReader reader, Artist artist, bool all_rels_loaded) : base (reader, artist, all_rels_loaded)
         {
         }
 

Added: trunk/banshee/src/Libraries/MusicBrainz/MusicBrainz/sync.sh
==============================================================================
--- (empty file)
+++ trunk/banshee/src/Libraries/MusicBrainz/MusicBrainz/sync.sh	Mon Mar 31 03:08:12 2008
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+rm -f *.cs
+svn co svn://svn.gnome.org/svn/banshee/trunk/musicbrainz-sharp/src/MusicBrainz/MusicBrainz
+cp MusicBrainz/*.cs .
+rm -rf MusicBrainz
+
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]