banshee r3668 - in trunk/banshee: . build data/audio-profiles src/Core/Banshee.Core/Banshee.Base src/Core/Banshee.Services src/Core/Banshee.Services/Banshee.AudioProfiles src/Core/Banshee.Services/Banshee.MediaProfiles src/Core/Banshee.Services/Banshee.ServiceStack src/Core/Banshee.ThickClient src/Core/Banshee.ThickClient/Banshee.AudioProfiles.Gui src/Core/Banshee.ThickClient/Banshee.Gui src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs src/Core/Banshee.ThickClient/Banshee.MediaProfiles.Gui src/Dap src/Dap/Banshee.Dap src/Dap/Banshee.Dap.MassStorage src/Extensions src/Extensions/Banshee.AudioCd/Banshee.AudioCd
- From: abock svn gnome org
- To: svn-commits-list gnome org
- Subject: banshee r3668 - in trunk/banshee: . build data/audio-profiles src/Core/Banshee.Core/Banshee.Base src/Core/Banshee.Services src/Core/Banshee.Services/Banshee.AudioProfiles src/Core/Banshee.Services/Banshee.MediaProfiles src/Core/Banshee.Services/Banshee.ServiceStack src/Core/Banshee.ThickClient src/Core/Banshee.ThickClient/Banshee.AudioProfiles.Gui src/Core/Banshee.ThickClient/Banshee.Gui src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs src/Core/Banshee.ThickClient/Banshee.MediaProfiles.Gui src/Dap src/Dap/Banshee.Dap src/Dap/Banshee.Dap.MassStorage src/Extensions src/Extensions/Banshee.AudioCd/Banshee.AudioCd
- Date: Fri, 4 Apr 2008 02:09:22 +0100 (BST)
Author: abock
Date: Fri Apr 4 02:09:21 2008
New Revision: 3668
URL: http://svn.gnome.org/viewvc/banshee?rev=3668&view=rev
Log:
2008-04-03 Aaron Bockover <abock gnome org>
* build/build.rules.mk:
* data/audio-profiles/Makefile.am: Changed the uninstall data directory
layout inside of bin/; copy audio profiles as well so they'll work
bundled or uninstalled
* src/Core/Banshee.Core/Banshee.Base/ApplicationContext.cs: Minor fixes
* src/Core/Banshee.Core/Banshee.Base/Paths.cs: Fixed up the code to detect
what to use as 'datadir' - if there is a share directory in the directory
that contains the entry assembly, we will use that directory as the
installation prefix which means external datadir files will work
when running uninstalled or if bundled, like we'll ship on Windows;
otherwise the proper prefix is calculated (i.e. /usr)
* src/Core/Banshee.Services/Banshee.MediaProfiles:
* src/Core/Banshee.ThickClient/Banshee.MediaProfiles.Gui: Renamed from
Banshee.AudioProfiles* since one day we'll support video profiles as well
* src/Core/Banshee.Services/Banshee.MediaProfiles/MediaProfileManager.cs:
Fix up the profile loading/path code so profiles actually load now
* src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/PreferencesDialog.cs:
Reflect the API
* src/Core/Banshee.ThickClient/Banshee.Gui/BansheeIconFactory.cs:
Use the new datadir detection path
* src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdRipper.cs:
Stubbbbs
Added:
trunk/banshee/src/Core/Banshee.Services/Banshee.MediaProfiles/
- copied from r3665, /trunk/banshee/src/Core/Banshee.Services/Banshee.AudioProfiles/
trunk/banshee/src/Core/Banshee.Services/Banshee.MediaProfiles/MediaProfileManager.cs
- copied, changed from r3665, /trunk/banshee/src/Core/Banshee.Services/Banshee.AudioProfiles/ProfileManager.cs
trunk/banshee/src/Core/Banshee.ThickClient/Banshee.MediaProfiles.Gui/
- copied from r3665, /trunk/banshee/src/Core/Banshee.ThickClient/Banshee.AudioProfiles.Gui/
Removed:
trunk/banshee/src/Core/Banshee.Services/Banshee.AudioProfiles/
trunk/banshee/src/Core/Banshee.Services/Banshee.MediaProfiles/ProfileManager.cs
trunk/banshee/src/Core/Banshee.ThickClient/Banshee.AudioProfiles.Gui/
Modified:
trunk/banshee/ChangeLog
trunk/banshee/build/build.rules.mk
trunk/banshee/data/audio-profiles/Makefile.am
trunk/banshee/src/Core/Banshee.Core/Banshee.Base/ApplicationContext.cs
trunk/banshee/src/Core/Banshee.Core/Banshee.Base/Paths.cs
trunk/banshee/src/Core/Banshee.Services/Banshee.MediaProfiles/Pipeline.cs
trunk/banshee/src/Core/Banshee.Services/Banshee.MediaProfiles/PipelineVariable.cs
trunk/banshee/src/Core/Banshee.Services/Banshee.MediaProfiles/Profile.cs
trunk/banshee/src/Core/Banshee.Services/Banshee.MediaProfiles/ProfileConfiguration.cs
trunk/banshee/src/Core/Banshee.Services/Banshee.ServiceStack/ServiceManager.cs
trunk/banshee/src/Core/Banshee.Services/Banshee.Services.mdp
trunk/banshee/src/Core/Banshee.Services/Makefile.am
trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/PreferencesDialog.cs
trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui/BansheeIconFactory.cs
trunk/banshee/src/Core/Banshee.ThickClient/Banshee.MediaProfiles.Gui/ProfileComboBox.cs
trunk/banshee/src/Core/Banshee.ThickClient/Banshee.MediaProfiles.Gui/ProfileComboBoxConfigurable.cs
trunk/banshee/src/Core/Banshee.ThickClient/Banshee.MediaProfiles.Gui/ProfileConfigurationDialog.cs
trunk/banshee/src/Core/Banshee.ThickClient/Banshee.MediaProfiles.Gui/ProfileConfigureButton.cs
trunk/banshee/src/Core/Banshee.ThickClient/Banshee.MediaProfiles.Gui/TextViewLabel.cs
trunk/banshee/src/Core/Banshee.ThickClient/Banshee.ThickClient.mdp
trunk/banshee/src/Core/Banshee.ThickClient/Makefile.am
trunk/banshee/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage.mdp
trunk/banshee/src/Dap/Banshee.Dap.MassStorage/Makefile.am
trunk/banshee/src/Dap/Banshee.Dap/Banshee.Dap.mdp
trunk/banshee/src/Dap/Dap.mds
trunk/banshee/src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdRipper.cs
trunk/banshee/src/Extensions/Extensions.mds
Modified: trunk/banshee/build/build.rules.mk
==============================================================================
--- trunk/banshee/build/build.rules.mk (original)
+++ trunk/banshee/build/build.rules.mk Fri Apr 4 02:09:21 2008
@@ -30,7 +30,7 @@
$(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(DEP_LINK)
@mkdir -p $(top_builddir)/bin
- @(test -d $(srcdir)/ThemeIcons && mkdir -p $(top_builddir)/bin/icons/hicolor && cp -rf $(srcdir)/ThemeIcons/* $(top_builddir)/bin/icons/hicolor) || true
+ @(test -d $(srcdir)/ThemeIcons && mkdir -p $(top_builddir)/bin/share/$(PACKAGE)/icons/hicolor && cp -rf $(srcdir)/ThemeIcons/* $(top_builddir)/bin/share/$(PACKAGE)/icons/hicolor) || true
@colors=no; \
case $$TERM in \
"xterm" | "rxvt" | "rxvt-unicode") \
Modified: trunk/banshee/data/audio-profiles/Makefile.am
==============================================================================
--- trunk/banshee/data/audio-profiles/Makefile.am (original)
+++ trunk/banshee/data/audio-profiles/Makefile.am Fri Apr 4 02:09:21 2008
@@ -12,6 +12,9 @@
@INTLTOOL_XML_RULE@
+all:
+ mkdir -p $(top_builddir)/bin/share/$(PACKAGE)/audio-profiles && cp $(wildcard $(srcdir)/*.xml) $(top_builddir)/bin/share/$(PACKAGE)/audio-profiles
+
EXTRA_DIST = $(audioprofiles_in_files)
DISTCLEANFILES = *.xml
MAINTAINERCLEANFILES = Makefile.in
Modified: trunk/banshee/src/Core/Banshee.Core/Banshee.Base/ApplicationContext.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.Core/Banshee.Base/ApplicationContext.cs (original)
+++ trunk/banshee/src/Core/Banshee.Core/Banshee.Base/ApplicationContext.cs Fri Apr 4 02:09:21 2008
@@ -35,6 +35,11 @@
{
public static class ApplicationContext
{
+ static ApplicationContext ()
+ {
+ Log.Debugging = Debugging;
+ }
+
private static CommandLineParser command_line = new CommandLineParser ("enqueue");
public static CommandLineParser CommandLine {
set { command_line = value; }
@@ -65,13 +70,8 @@
return !String.IsNullOrEmpty (Environment.GetEnvironmentVariable (env));
}
- private static System.Globalization.CultureInfo culture_info = new System.Globalization.CultureInfo ("en-US");
public static System.Globalization.CultureInfo InternalCultureInfo {
- get { return culture_info; }
- }
-
- static ApplicationContext () {
- Log.Debugging = Debugging;
+ get { return System.Globalization.CultureInfo.InvariantCulture; }
}
}
}
Modified: trunk/banshee/src/Core/Banshee.Core/Banshee.Base/Paths.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.Core/Banshee.Base/Paths.cs (original)
+++ trunk/banshee/src/Core/Banshee.Core/Banshee.Base/Paths.cs Fri Apr 4 02:09:21 2008
@@ -146,6 +146,11 @@
if (installed_application_prefix == null) {
installed_application_prefix = Path.GetDirectoryName (
System.Reflection.Assembly.GetEntryAssembly ().Location);
+
+ if (Directory.Exists (Paths.Combine (installed_application_prefix, "share", "banshee-1"))) {
+ return installed_application_prefix;
+ }
+
DirectoryInfo entry_directory = new DirectoryInfo (installed_application_prefix);
if (entry_directory != null && entry_directory.Parent != null && entry_directory.Parent.Parent != null) {
@@ -164,5 +169,10 @@
public static string InstalledApplicationData {
get { return Path.Combine (InstalledApplicationDataRoot, "banshee-1"); }
}
+
+ public static string GetInstalledDataDirectory (string path)
+ {
+ return Path.Combine (InstalledApplicationData, path);
+ }
}
}
Copied: trunk/banshee/src/Core/Banshee.Services/Banshee.MediaProfiles/MediaProfileManager.cs (from r3665, /trunk/banshee/src/Core/Banshee.Services/Banshee.AudioProfiles/ProfileManager.cs)
==============================================================================
--- /trunk/banshee/src/Core/Banshee.Services/Banshee.AudioProfiles/ProfileManager.cs (original)
+++ trunk/banshee/src/Core/Banshee.Services/Banshee.MediaProfiles/MediaProfileManager.cs Fri Apr 4 02:09:21 2008
@@ -35,7 +35,7 @@
using Banshee.ServiceStack;
-namespace Banshee.AudioProfiles
+namespace Banshee.MediaProfiles
{
public class TestProfileArgs : EventArgs
{
@@ -59,12 +59,10 @@
public delegate void TestProfileHandler(object o, TestProfileArgs args);
- public class ProfileManager : IEnumerable<Profile>, IService
+ public class MediaProfileManager : IEnumerable<Profile>, IService
{
- private static System.Globalization.CultureInfo culture_info = new System.Globalization.CultureInfo("en-US");
-
internal static System.Globalization.CultureInfo CultureInfo {
- get { return culture_info; }
+ get { return System.Globalization.CultureInfo.InvariantCulture; }
}
private XmlDocument document;
@@ -73,10 +71,9 @@
public event TestProfileHandler TestProfile;
- public ProfileManager()
+ public MediaProfileManager()
{
- // TODO replace w/ real path code or property
- string path = "";
+ string path = Banshee.Base.Paths.GetInstalledDataDirectory ("audio-profiles");
if(File.Exists(path)) {
LoadFromFile(path);
} else if(Directory.Exists(path)) {
@@ -256,7 +253,7 @@
}
string Banshee.ServiceStack.IService.ServiceName {
- get { return "ProfileManager"; }
+ get { return "MediaProfileManager"; }
}
public override string ToString()
Modified: trunk/banshee/src/Core/Banshee.Services/Banshee.MediaProfiles/Pipeline.cs
==============================================================================
--- /trunk/banshee/src/Core/Banshee.Services/Banshee.AudioProfiles/Pipeline.cs (original)
+++ trunk/banshee/src/Core/Banshee.Services/Banshee.MediaProfiles/Pipeline.cs Fri Apr 4 02:09:21 2008
@@ -36,7 +36,7 @@
using Hyena.SExpEngine;
using Banshee.Base;
-namespace Banshee.AudioProfiles
+namespace Banshee.MediaProfiles
{
public class Pipeline : IEnumerable<PipelineVariable>
{
@@ -81,7 +81,7 @@
private Dictionary<string, string> processes = new Dictionary<string, string>();
private List<Process> processes_pending = new List<Process>();
- internal Pipeline(ProfileManager manager, XmlNode node)
+ internal Pipeline(MediaProfileManager manager, XmlNode node)
{
foreach(XmlNode process_node in node.SelectNodes("process")) {
string process_id = process_node.Attributes["id"].Value.Trim();
Modified: trunk/banshee/src/Core/Banshee.Services/Banshee.MediaProfiles/PipelineVariable.cs
==============================================================================
--- /trunk/banshee/src/Core/Banshee.Services/Banshee.AudioProfiles/PipelineVariable.cs (original)
+++ trunk/banshee/src/Core/Banshee.Services/Banshee.MediaProfiles/PipelineVariable.cs Fri Apr 4 02:09:21 2008
@@ -32,7 +32,7 @@
using System.Collections;
using System.Collections.Generic;
-namespace Banshee.AudioProfiles
+namespace Banshee.MediaProfiles
{
public enum PipelineVariableControlType
{
@@ -220,7 +220,7 @@
private static double ToDouble(string str)
{
try {
- return Convert.ToDouble(str, ProfileManager.CultureInfo);
+ return Convert.ToDouble(str, MediaProfileManager.CultureInfo);
} catch {
}
@@ -318,13 +318,13 @@
try {
return DefaultValue == null || DefaultValue == String.Empty ?
(double?)null :
- Convert.ToDouble(DefaultValue, ProfileManager.CultureInfo);
+ Convert.ToDouble(DefaultValue, MediaProfileManager.CultureInfo);
} catch {
return null;
}
}
- set { DefaultValue = Convert.ToString(value, ProfileManager.CultureInfo); }
+ set { DefaultValue = Convert.ToString(value, MediaProfileManager.CultureInfo); }
}
public double? CurrentValueNumeric {
@@ -332,13 +332,13 @@
try {
return CurrentValue == null || CurrentValue == String.Empty ?
(double?)null :
- Convert.ToDouble(CurrentValue, ProfileManager.CultureInfo);
+ Convert.ToDouble(CurrentValue, MediaProfileManager.CultureInfo);
} catch {
return null;
}
}
- set { CurrentValue = Convert.ToString(value, ProfileManager.CultureInfo); }
+ set { CurrentValue = Convert.ToString(value, MediaProfileManager.CultureInfo); }
}
public double MinValue {
Modified: trunk/banshee/src/Core/Banshee.Services/Banshee.MediaProfiles/Profile.cs
==============================================================================
--- /trunk/banshee/src/Core/Banshee.Services/Banshee.AudioProfiles/Profile.cs (original)
+++ trunk/banshee/src/Core/Banshee.Services/Banshee.MediaProfiles/Profile.cs Fri Apr 4 02:09:21 2008
@@ -32,7 +32,7 @@
using System.Collections;
using System.Collections.Generic;
-namespace Banshee.AudioProfiles
+namespace Banshee.MediaProfiles
{
public class Profile
{
@@ -45,7 +45,7 @@
private Pipeline pipeline;
private ProfileConfiguration configuration;
- internal Profile(ProfileManager manager, XmlNode node)
+ internal Profile(MediaProfileManager manager, XmlNode node)
{
id = node.Attributes["id"].Value.Trim();
name = Banshee.Base.Localization.SelectSingleNode(node, "name").InnerText.Trim();
Modified: trunk/banshee/src/Core/Banshee.Services/Banshee.MediaProfiles/ProfileConfiguration.cs
==============================================================================
--- /trunk/banshee/src/Core/Banshee.Services/Banshee.AudioProfiles/ProfileConfiguration.cs (original)
+++ trunk/banshee/src/Core/Banshee.Services/Banshee.MediaProfiles/ProfileConfiguration.cs Fri Apr 4 02:09:21 2008
@@ -34,7 +34,7 @@
using Banshee.Configuration;
-namespace Banshee.AudioProfiles
+namespace Banshee.MediaProfiles
{
public class ProfileConfiguration : IEnumerable<KeyValuePair<string, string>>
{
@@ -49,7 +49,7 @@
return configuration;
}
- public static Profile LoadActiveProfile(ProfileManager manager, string id)
+ public static Profile LoadActiveProfile(MediaProfileManager manager, string id)
{
string profile_id = ConfigurationClient.Get<string>(MakeConfNamespace(id), "active_profile", string.Empty);
Modified: trunk/banshee/src/Core/Banshee.Services/Banshee.ServiceStack/ServiceManager.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.Services/Banshee.ServiceStack/ServiceManager.cs (original)
+++ trunk/banshee/src/Core/Banshee.Services/Banshee.ServiceStack/ServiceManager.cs Fri Apr 4 02:09:21 2008
@@ -34,7 +34,7 @@
using Hyena;
using Banshee.Base;
-using Banshee.AudioProfiles;
+using Banshee.MediaProfiles;
using Banshee.Sources;
using Banshee.Database;
using Banshee.MediaEngine;
@@ -63,7 +63,7 @@
RegisterService<DBusServiceManager> ();
RegisterService<BansheeDbConnection> ();
RegisterService<SourceManager> ();
- RegisterService<ProfileManager> ();
+ RegisterService<MediaProfileManager> ();
RegisterService<PlayerEngineService> ();
RegisterService<PlaybackControllerService> ();
RegisterService<ImportSourceManager> ();
@@ -269,8 +269,8 @@
get { return (BansheeDbConnection)Get ("DbConnection"); }
}
- public static ProfileManager ProfileManager {
- get { return (ProfileManager)Get ("ProfileManager"); }
+ public static MediaProfileManager MediaProfileManager {
+ get { return Get<MediaProfileManager> (); }
}
public static SourceManager SourceManager {
Modified: trunk/banshee/src/Core/Banshee.Services/Banshee.Services.mdp
==============================================================================
--- trunk/banshee/src/Core/Banshee.Services/Banshee.Services.mdp (original)
+++ trunk/banshee/src/Core/Banshee.Services/Banshee.Services.mdp Fri Apr 4 02:09:21 2008
@@ -70,11 +70,6 @@
<File name="Banshee.Sources/ErrorSource.cs" subtype="Code" buildaction="Compile" />
<File name="Banshee.MediaEngine/IPlayerEngineService.cs" subtype="Code" buildaction="Compile" />
<File name="Banshee.Collection/BansheeListModel.cs" subtype="Code" buildaction="Compile" />
- <File name="Banshee.AudioProfiles/Pipeline.cs" subtype="Code" buildaction="Compile" />
- <File name="Banshee.AudioProfiles/PipelineVariable.cs" subtype="Code" buildaction="Compile" />
- <File name="Banshee.AudioProfiles/Profile.cs" subtype="Code" buildaction="Compile" />
- <File name="Banshee.AudioProfiles/ProfileConfiguration.cs" subtype="Code" buildaction="Compile" />
- <File name="Banshee.AudioProfiles/ProfileManager.cs" subtype="Code" buildaction="Compile" />
<File name="Banshee.Playlist/AbstractPlaylistSource.cs" subtype="Code" buildaction="Compile" />
<File name="Banshee.Playlist/PlaylistFileUtil.cs" subtype="Code" buildaction="Compile" />
<File name="Banshee.SmartPlaylist/Migrator.cs" subtype="Code" buildaction="Compile" />
@@ -144,6 +139,11 @@
<File name="Banshee.MediaEngine/IAudioCdRipper.cs" subtype="Code" buildaction="Compile" />
<File name="Banshee.Collection.Database/DatabaseImportManager.cs" subtype="Code" buildaction="Compile" />
<File name="Banshee.ServiceStack/InterfaceAction.cs" subtype="Code" buildaction="Compile" />
+ <File name="Banshee.MediaProfiles/MediaProfileManager.cs" subtype="Code" buildaction="Compile" />
+ <File name="Banshee.MediaProfiles/Pipeline.cs" subtype="Code" buildaction="Compile" />
+ <File name="Banshee.MediaProfiles/PipelineVariable.cs" subtype="Code" buildaction="Compile" />
+ <File name="Banshee.MediaProfiles/Profile.cs" subtype="Code" buildaction="Compile" />
+ <File name="Banshee.MediaProfiles/ProfileConfiguration.cs" subtype="Code" buildaction="Compile" />
</Contents>
<References>
<ProjectReference type="Gac" localcopy="True" refto="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
Modified: trunk/banshee/src/Core/Banshee.Services/Makefile.am
==============================================================================
--- trunk/banshee/src/Core/Banshee.Services/Makefile.am (original)
+++ trunk/banshee/src/Core/Banshee.Services/Makefile.am Fri Apr 4 02:09:21 2008
@@ -3,11 +3,6 @@
LINK = $(REF_BANSHEE_SERVICES)
SOURCES = \
- Banshee.AudioProfiles/Pipeline.cs \
- Banshee.AudioProfiles/PipelineVariable.cs \
- Banshee.AudioProfiles/Profile.cs \
- Banshee.AudioProfiles/ProfileConfiguration.cs \
- Banshee.AudioProfiles/ProfileManager.cs \
Banshee.Base/RateLimiter.cs \
Banshee.Base/ThreadAssist.cs \
Banshee.Collection.Database/AlbumListDatabaseModel.cs \
@@ -61,6 +56,11 @@
Banshee.MediaEngine/PlayerEngineEvent.cs \
Banshee.MediaEngine/PlayerEngineService.cs \
Banshee.MediaEngine/PlayerEngineState.cs \
+ Banshee.MediaProfiles/MediaProfileManager.cs \
+ Banshee.MediaProfiles/Pipeline.cs \
+ Banshee.MediaProfiles/PipelineVariable.cs \
+ Banshee.MediaProfiles/Profile.cs \
+ Banshee.MediaProfiles/ProfileConfiguration.cs \
Banshee.Metadata.Embedded/EmbeddedMetadataProvider.cs \
Banshee.Metadata.Embedded/EmbeddedQueryJob.cs \
Banshee.Metadata.MusicBrainz/MusicBrainzMetadataProvider.cs \
Modified: trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/PreferencesDialog.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/PreferencesDialog.cs (original)
+++ trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/PreferencesDialog.cs Fri Apr 4 02:09:21 2008
@@ -39,8 +39,8 @@
using Banshee.ServiceStack;
using Banshee.Collection;
using Banshee.Widgets;
-using Banshee.AudioProfiles;
-using Banshee.AudioProfiles.Gui;
+using Banshee.MediaProfiles;
+using Banshee.MediaProfiles.Gui;
using Banshee.Configuration.Schema;
namespace Banshee.Gui.Dialogs
@@ -74,7 +74,7 @@
(Glade["library_location_label"] as Label).MnemonicWidget = library_location_chooser;
library_location_chooser.Show();
- cd_importing_profile_box = new ProfileComboBoxConfigurable(ServiceManager.ProfileManager, "cd-importing",
+ cd_importing_profile_box = new ProfileComboBoxConfigurable(ServiceManager.MediaProfileManager, "cd-importing",
Glade["cd_importing_profile_description"] as Box);
(Glade["cd_importing_profile_container"] as Box).PackStart(cd_importing_profile_box, false, false, 0);
(Glade["cd_importing_profile_label"] as Label).MnemonicWidget = cd_importing_profile_box.Combo;
Modified: trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui/BansheeIconFactory.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui/BansheeIconFactory.cs (original)
+++ trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui/BansheeIconFactory.cs Fri Apr 4 02:09:21 2008
@@ -45,13 +45,12 @@
{
theme = IconTheme.Default;
- Assembly entry_asm = Assembly.GetEntryAssembly ();
- string icon_theme_path = Path.Combine (Path.GetDirectoryName (entry_asm.Location), "icons");
+ string icon_theme_path = Banshee.Base.Paths.GetInstalledDataDirectory ("icons");
if (Directory.Exists (icon_theme_path)) {
Hyena.Log.DebugFormat ("Adding icon theme search path: {0}", icon_theme_path);
Theme.AppendSearchPath (icon_theme_path);
}
-
+
AddDefault ();
}
Modified: trunk/banshee/src/Core/Banshee.ThickClient/Banshee.MediaProfiles.Gui/ProfileComboBox.cs
==============================================================================
--- /trunk/banshee/src/Core/Banshee.ThickClient/Banshee.AudioProfiles.Gui/ProfileComboBox.cs (original)
+++ trunk/banshee/src/Core/Banshee.ThickClient/Banshee.MediaProfiles.Gui/ProfileComboBox.cs Fri Apr 4 02:09:21 2008
@@ -32,17 +32,17 @@
using Mono.Unix;
using Gtk;
-namespace Banshee.AudioProfiles.Gui
+namespace Banshee.MediaProfiles.Gui
{
public class ProfileComboBox : ComboBox
{
- private ProfileManager manager;
+ private MediaProfileManager manager;
private ListStore store;
private string [] mimetype_filter;
public event EventHandler Updated;
- public ProfileComboBox(ProfileManager manager)
+ public ProfileComboBox(MediaProfileManager manager)
{
this.manager = manager;
Modified: trunk/banshee/src/Core/Banshee.ThickClient/Banshee.MediaProfiles.Gui/ProfileComboBoxConfigurable.cs
==============================================================================
--- /trunk/banshee/src/Core/Banshee.ThickClient/Banshee.AudioProfiles.Gui/ProfileComboBoxConfigurable.cs (original)
+++ trunk/banshee/src/Core/Banshee.ThickClient/Banshee.MediaProfiles.Gui/ProfileComboBoxConfigurable.cs Fri Apr 4 02:09:21 2008
@@ -29,7 +29,7 @@
using System;
using Gtk;
-namespace Banshee.AudioProfiles.Gui
+namespace Banshee.MediaProfiles.Gui
{
public class ProfileComboBoxConfigurable : VBox
{
@@ -38,12 +38,12 @@
private TextViewLabel description;
private string configuration_id;
- public ProfileComboBoxConfigurable(ProfileManager manager, string configurationId)
+ public ProfileComboBoxConfigurable(MediaProfileManager manager, string configurationId)
: this(manager, configurationId, null)
{
}
- public ProfileComboBoxConfigurable(ProfileManager manager, string configurationId, Box parent)
+ public ProfileComboBoxConfigurable(MediaProfileManager manager, string configurationId, Box parent)
{
HBox editor = new HBox();
Modified: trunk/banshee/src/Core/Banshee.ThickClient/Banshee.MediaProfiles.Gui/ProfileConfigurationDialog.cs
==============================================================================
--- /trunk/banshee/src/Core/Banshee.ThickClient/Banshee.AudioProfiles.Gui/ProfileConfigurationDialog.cs (original)
+++ trunk/banshee/src/Core/Banshee.ThickClient/Banshee.MediaProfiles.Gui/ProfileConfigurationDialog.cs Fri Apr 4 02:09:21 2008
@@ -32,10 +32,10 @@
using Gtk;
-using Banshee.AudioProfiles;
+using Banshee.MediaProfiles;
using Banshee.Base;
-namespace Banshee.AudioProfiles.Gui
+namespace Banshee.MediaProfiles.Gui
{
internal class PipelineVariableComboBox : Gtk.ComboBox
{
Modified: trunk/banshee/src/Core/Banshee.ThickClient/Banshee.MediaProfiles.Gui/ProfileConfigureButton.cs
==============================================================================
--- /trunk/banshee/src/Core/Banshee.ThickClient/Banshee.AudioProfiles.Gui/ProfileConfigureButton.cs (original)
+++ trunk/banshee/src/Core/Banshee.ThickClient/Banshee.MediaProfiles.Gui/ProfileConfigureButton.cs Fri Apr 4 02:09:21 2008
@@ -29,7 +29,7 @@
using System;
using Gtk;
-namespace Banshee.AudioProfiles.Gui
+namespace Banshee.MediaProfiles.Gui
{
public class ProfileConfigureButton : Button
{
Modified: trunk/banshee/src/Core/Banshee.ThickClient/Banshee.MediaProfiles.Gui/TextViewLabel.cs
==============================================================================
--- /trunk/banshee/src/Core/Banshee.ThickClient/Banshee.AudioProfiles.Gui/TextViewLabel.cs (original)
+++ trunk/banshee/src/Core/Banshee.ThickClient/Banshee.MediaProfiles.Gui/TextViewLabel.cs Fri Apr 4 02:09:21 2008
@@ -29,7 +29,7 @@
using System;
using Gtk;
-namespace Banshee.AudioProfiles.Gui
+namespace Banshee.MediaProfiles.Gui
{
public class TextViewLabel : TextView
{
Modified: trunk/banshee/src/Core/Banshee.ThickClient/Banshee.ThickClient.mdp
==============================================================================
--- trunk/banshee/src/Core/Banshee.ThickClient/Banshee.ThickClient.mdp (original)
+++ trunk/banshee/src/Core/Banshee.ThickClient/Banshee.ThickClient.mdp Fri Apr 4 02:09:21 2008
@@ -61,11 +61,11 @@
<File name="Banshee.Collection.Gui/ArtworkRenderer.cs" subtype="Code" buildaction="Compile" />
<File name="Banshee.Gui/TrackActions.cs" subtype="Code" buildaction="Compile" />
<File name="Banshee.Gui.Widgets/ArtworkPopup.cs" subtype="Code" buildaction="Compile" />
- <File name="Banshee.AudioProfiles.Gui/ProfileComboBox.cs" subtype="Code" buildaction="Compile" />
- <File name="Banshee.AudioProfiles.Gui/ProfileComboBoxConfigurable.cs" subtype="Code" buildaction="Compile" />
- <File name="Banshee.AudioProfiles.Gui/ProfileConfigurationDialog.cs" subtype="Code" buildaction="Compile" />
- <File name="Banshee.AudioProfiles.Gui/ProfileConfigureButton.cs" subtype="Code" buildaction="Compile" />
- <File name="Banshee.AudioProfiles.Gui/TextViewLabel.cs" subtype="Code" buildaction="Compile" />
+ <File name="Banshee.MediaProfiles.Gui/ProfileComboBox.cs" subtype="Code" buildaction="Compile" />
+ <File name="Banshee.MediaProfiles.Gui/ProfileComboBoxConfigurable.cs" subtype="Code" buildaction="Compile" />
+ <File name="Banshee.MediaProfiles.Gui/ProfileConfigurationDialog.cs" subtype="Code" buildaction="Compile" />
+ <File name="Banshee.MediaProfiles.Gui/ProfileConfigureButton.cs" subtype="Code" buildaction="Compile" />
+ <File name="Banshee.MediaProfiles.Gui/TextViewLabel.cs" subtype="Code" buildaction="Compile" />
<File name="Banshee.Collection.Gui/ColumnCellDateTime.cs" subtype="Code" buildaction="Compile" />
<File name="Banshee.Gui/BansheeActionGroup.cs" subtype="Code" buildaction="Compile" />
<File name="Banshee.Gui/IHasSourceView.cs" subtype="Code" buildaction="Compile" />
Modified: trunk/banshee/src/Core/Banshee.ThickClient/Makefile.am
==============================================================================
--- trunk/banshee/src/Core/Banshee.ThickClient/Makefile.am (original)
+++ trunk/banshee/src/Core/Banshee.ThickClient/Makefile.am Fri Apr 4 02:09:21 2008
@@ -4,11 +4,6 @@
LINK = $(REF_BANSHEE_THICKCLIENT)
SOURCES = \
- Banshee.AudioProfiles.Gui/ProfileComboBox.cs \
- Banshee.AudioProfiles.Gui/ProfileComboBoxConfigurable.cs \
- Banshee.AudioProfiles.Gui/ProfileConfigurationDialog.cs \
- Banshee.AudioProfiles.Gui/ProfileConfigureButton.cs \
- Banshee.AudioProfiles.Gui/TextViewLabel.cs \
Banshee.Collection.Gui/AlbumListView.cs \
Banshee.Collection.Gui/ArtistListView.cs \
Banshee.Collection.Gui/ArtworkManager.cs \
@@ -69,6 +64,11 @@
Banshee.Library.Gui/FileImportSource.cs \
Banshee.Library.Gui/FolderImportSource.cs \
Banshee.Library.Gui/ImportDialog.cs \
+ Banshee.MediaProfiles.Gui/ProfileComboBox.cs \
+ Banshee.MediaProfiles.Gui/ProfileComboBoxConfigurable.cs \
+ Banshee.MediaProfiles.Gui/ProfileConfigurationDialog.cs \
+ Banshee.MediaProfiles.Gui/ProfileConfigureButton.cs \
+ Banshee.MediaProfiles.Gui/TextViewLabel.cs \
Banshee.Playlist.Gui/PlaylistExportDialog.cs \
Banshee.Query.Gui/BansheeQueryBox.cs \
Banshee.Query.Gui/PlaylistQueryValueEntry.cs \
Modified: trunk/banshee/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage.mdp
==============================================================================
--- trunk/banshee/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage.mdp (original)
+++ trunk/banshee/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage.mdp Fri Apr 4 02:09:21 2008
@@ -27,4 +27,4 @@
<AsmRefVar />
<ProjectRefVar />
</MonoDevelop.Autotools.MakefileInfo>
-</Project>
+</Project>
\ No newline at end of file
Modified: trunk/banshee/src/Dap/Banshee.Dap.MassStorage/Makefile.am
==============================================================================
--- trunk/banshee/src/Dap/Banshee.Dap.MassStorage/Makefile.am (original)
+++ trunk/banshee/src/Dap/Banshee.Dap.MassStorage/Makefile.am Fri Apr 4 02:09:21 2008
@@ -3,8 +3,7 @@
LINK = $(REF_DAP_MASS_STORAGE)
INSTALL_DIR = $(EXTENSIONS_INSTALL_DIR)
-SOURCES = \
- Banshee.Dap.MassStorage/MassStorageSource.cs
+SOURCES = Banshee.Dap.MassStorage/MassStorageSource.cs
RESOURCES = Banshee.Dap.MassStorage.addin.xml
Modified: trunk/banshee/src/Dap/Banshee.Dap/Banshee.Dap.mdp
==============================================================================
--- trunk/banshee/src/Dap/Banshee.Dap/Banshee.Dap.mdp (original)
+++ trunk/banshee/src/Dap/Banshee.Dap/Banshee.Dap.mdp Fri Apr 4 02:09:21 2008
@@ -28,4 +28,4 @@
<AsmRefVar />
<ProjectRefVar />
</MonoDevelop.Autotools.MakefileInfo>
-</Project>
+</Project>
\ No newline at end of file
Modified: trunk/banshee/src/Dap/Dap.mds
==============================================================================
--- trunk/banshee/src/Dap/Dap.mds (original)
+++ trunk/banshee/src/Dap/Dap.mds Fri Apr 4 02:09:21 2008
@@ -13,4 +13,4 @@
<Entry filename="Banshee.Dap/Banshee.Dap.mdp" />
<Entry filename="Banshee.Dap.MassStorage/Banshee.Dap.MassStorage.mdp" />
</Entries>
-</Combine>
+</Combine>
\ No newline at end of file
Modified: trunk/banshee/src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdRipper.cs
==============================================================================
--- trunk/banshee/src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdRipper.cs (original)
+++ trunk/banshee/src/Extensions/Banshee.AudioCd/Banshee.AudioCd/AudioCdRipper.cs Fri Apr 4 02:09:21 2008
@@ -108,6 +108,11 @@
return;
}
+// ServiceManager.
+//
+// profile = Globals.AudioProfileManager.GetConfiguredActiveProfile ("cd-importing",
+// new string [] { "audio/ogg", "audio/mp3", "audio/wav" });
+//
source.LockAllTracks ();
user_job = new UserJob (Catalog.GetString ("Importing Audio CD"),
Modified: trunk/banshee/src/Extensions/Extensions.mds
==============================================================================
--- trunk/banshee/src/Extensions/Extensions.mds (original)
+++ trunk/banshee/src/Extensions/Extensions.mds Fri Apr 4 02:09:21 2008
@@ -31,4 +31,4 @@
<Entry filename="Banshee.Bookmarks/Banshee.Bookmarks.mdp" />
<Entry filename="Banshee.AudioCd/Banshee.AudioCd.mdp" />
</Entries>
-</Combine>
+</Combine>
\ No newline at end of file
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
