banshee r3437 - in trunk/banshee: . src/Core/Banshee.Core/Banshee.Streaming src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs src/Core/Banshee.ThickClient/Resources

[gburt svn gnome org]

Author: gburt
Date: Thu Mar 13 01:20:35 2008
New Revision: 3437
URL: http://svn.gnome.org/viewvc/banshee?rev=3437&view=rev

Log:
2008-03-12  Gabriel Burt  <gabriel burt gmail com>

	* src/Core/Banshee.ThickClient/Resources/banshee-dialogs.glade:
	* src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/TrackEditor.cs: Disable
	artist/album editing and add note explaining they are disabled for the
	preview release.

	* src/Core/Banshee.Core/Banshee.Streaming/StreamTagger.cs:
	* src/Core/Banshee.Core/Banshee.Streaming/SaveTrackMetadataJob.cs: Save
	all metadata possible back to files, and add notes about keeping these two
	classes in sync.


Modified:
   trunk/banshee/ChangeLog
   trunk/banshee/src/Core/Banshee.Core/Banshee.Streaming/SaveTrackMetadataJob.cs
   trunk/banshee/src/Core/Banshee.Core/Banshee.Streaming/StreamTagger.cs
   trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/TrackEditor.cs
   trunk/banshee/src/Core/Banshee.ThickClient/Resources/banshee-dialogs.glade

Modified: trunk/banshee/src/Core/Banshee.Core/Banshee.Streaming/SaveTrackMetadataJob.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.Core/Banshee.Streaming/SaveTrackMetadataJob.cs	(original)
+++ trunk/banshee/src/Core/Banshee.Core/Banshee.Streaming/SaveTrackMetadataJob.cs	Thu Mar 13 01:20:35 2008
@@ -54,6 +54,7 @@
                 return;
             }
         
+            // Note: this should be kept in sync with the metadata read in StreamTagger.cs
             TagLib.File file = StreamTagger.ProcessUri(track.Uri);
             file.Tag.AlbumArtists = new string [] { track.ArtistName };
             file.Tag.Album = track.AlbumTitle;
@@ -61,8 +62,12 @@
             file.Tag.Title = track.TrackTitle;
             file.Tag.Track = (uint)track.TrackNumber;
             file.Tag.TrackCount = (uint)track.TrackCount;
+            file.Tag.Composers = new string [] { track.Composer };
+            file.Tag.Copyright = track.Copyright;
+            file.Tag.Comment = track.Comment;
+            file.Tag.Disc = (uint)track.Disc;
             file.Tag.Year = (uint)track.Year;
-            file.Save();
+            file.Save ();
         }
     }
 }

Modified: trunk/banshee/src/Core/Banshee.Core/Banshee.Streaming/StreamTagger.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.Core/Banshee.Streaming/StreamTagger.cs	(original)
+++ trunk/banshee/src/Core/Banshee.Core/Banshee.Streaming/StreamTagger.cs	Thu Mar 13 01:20:35 2008
@@ -83,6 +83,7 @@
 
         public static void TrackInfoMerge (TrackInfo track, TagLib.File file, bool preferTrackInfo)
         {
+            // Note: this should be kept in sync with the metadata written in SaveTrackMetadataJob.cs
             track.Uri = new SafeUri (file.Name);
             track.MimeType = file.MimeType;
             track.FileSize = Banshee.IO.File.GetSize (track.Uri);

Modified: trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/TrackEditor.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/TrackEditor.cs	(original)
+++ trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/TrackEditor.cs	Thu Mar 13 01:20:35 2008
@@ -111,6 +111,8 @@
 
     public class TrackEditor : GladeWindow
     {
+        [Widget] private Notebook EditorNotebook;
+        [Widget] private VBox EditorVBox;
         [Widget] private Button CancelButton;
         [Widget] private Button SaveButton;
         [Widget] private Button Previous;
@@ -168,6 +170,13 @@
                     TrackSet.Add(new EditorTrack(track));
             }
             
+            Label notice = new Label ();
+            notice.Wrap = true;
+            notice.Markup = "<i>Note: The artist and album fields are not editable in this preview release.</i>";
+            notice.ShowAll ();
+            EditorVBox.PackStart (notice, false, true, 6);
+            EditorVBox.ReorderChild (notice, 0);
+            
             rating_entry.Show();
             (Glade["RatingLabel"] as Label).MnemonicWidget = rating_entry;
             RatingContainer.PackStart(rating_entry, false, false, 0);
@@ -191,6 +200,10 @@
             EnterNextTitle.Clicked += OnEnterNextTitleClicked;
             CoverButton.Clicked += OnCoverButtonClicked;
             
+            // FIXME artist/album editing disabled for now in trunk
+            Artist.Sensitive = false;
+            Album.Sensitive = false;
+            
             Artist.Changed += OnValueEdited;
             Album.Changed += OnValueEdited;
             Title.Changed += OnValueEdited;
@@ -223,7 +236,7 @@
             EnterNextTitle.Visible = TrackSet.Count > 1;
             Glade["SyncAllAlignment"].Visible = TrackSet.Count > 1;
             
-            (Glade["Notebook"] as Gtk.Notebook).RemovePage(1);
+            EditorNotebook.RemovePage(1);
 
             tips.SetTip(TrackNumberIterator, Catalog.GetString("Automatically set all track numbers in increasing order"), "track iterator");
             tips.SetTip(TrackCountSync, Catalog.GetString("Set all track counts to this value"), "track counts");

Modified: trunk/banshee/src/Core/Banshee.ThickClient/Resources/banshee-dialogs.glade
==============================================================================
--- trunk/banshee/src/Core/Banshee.ThickClient/Resources/banshee-dialogs.glade	(original)
+++ trunk/banshee/src/Core/Banshee.ThickClient/Resources/banshee-dialogs.glade	Thu Mar 13 01:20:35 2008
@@ -10,11 +10,14 @@
         <property name="visible">True</property>
         <property name="spacing">10</property>
         <child>
-          <widget class="GtkNotebook" id="Notebook">
+          <widget class="GtkNotebook" id="EditorNotebook">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <child>
-              <widget class="GtkTable" id="table1">
+              <widget class="GtkVBox" id="EditorVBox">
+                <property name="visible">True</property>
+            <child>
+              <widget class="GtkTable" id="EditorTable">
                 <property name="visible">True</property>
                 <property name="border_width">10</property>
                 <property name="n_rows">10</property>
@@ -624,6 +627,8 @@
                 </child>
               </widget>
             </child>
+              </widget>
+            </child>
             <child>
               <widget class="GtkLabel" id="label63">
                 <property name="visible">True</property>