banshee r3020 - in trunk/banshee: . src/Backends/Banshee.GStreamer/Banshee.GStreamer src/Core/Banshee.Services/Banshee.Equalizer src/Core/Banshee.Services/Banshee.MediaEngine src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui src/Core/Banshee.ThickClient/Banshee.Gui src/Core/Banshee.ThickClient/Resources
- From: gburt svn gnome org
- To: svn-commits-list gnome org
- Subject: banshee r3020 - in trunk/banshee: . src/Backends/Banshee.GStreamer/Banshee.GStreamer src/Core/Banshee.Services/Banshee.Equalizer src/Core/Banshee.Services/Banshee.MediaEngine src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui src/Core/Banshee.ThickClient/Banshee.Gui src/Core/Banshee.ThickClient/Resources
- Date: Fri, 25 Jan 2008 01:35:55 +0000 (GMT)
Author: gburt
Date: Fri Jan 25 01:35:54 2008
New Revision: 3020
URL: http://svn.gnome.org/viewvc/banshee?rev=3020&view=rev
Log:
2008-01-24 Gabriel Burt <gabriel burt gmail com>
Patch from Alexander Hixon <hixon alexander mediati org>.
* src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:
* src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs:
* src/Core/Banshee.Services/Banshee.Equalizer/EqualizerSetting.cs:
* src/Core/Banshee.Services/Banshee.Equalizer/EqualizerSettingEvent.cs:
* src/Core/Banshee.Services/Banshee.MediaEngine/IEqualizer.cs:
* src/Core/Banshee.Services/Banshee.MediaEngine/PlayerEngine.cs:
* src/Core/Banshee.Services/Banshee.MediaEngine/PlayerEngineService.cs:
* src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerBandScale.cs:
* src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerLevelsBox.cs:
* src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerPresetComboBox.cs:
* src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerView.cs:
* src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerWindow.cs:
* src/Core/Banshee.ThickClient/Banshee.Gui/ViewActions.cs: Conform to
HACKING.
* src/Core/Banshee.ThickClient/Resources/banshee-dialogs.glade: Make
equalizer window a dialog not utility window, ensuring it comes to top.
Modified:
trunk/banshee/ChangeLog
trunk/banshee/src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs
trunk/banshee/src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs
trunk/banshee/src/Core/Banshee.Services/Banshee.Equalizer/EqualizerSetting.cs
trunk/banshee/src/Core/Banshee.Services/Banshee.Equalizer/EqualizerSettingEvent.cs
trunk/banshee/src/Core/Banshee.Services/Banshee.MediaEngine/IEqualizer.cs
trunk/banshee/src/Core/Banshee.Services/Banshee.MediaEngine/PlayerEngine.cs
trunk/banshee/src/Core/Banshee.Services/Banshee.MediaEngine/PlayerEngineService.cs
trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerBandScale.cs
trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerLevelsBox.cs
trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerPresetComboBox.cs
trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerView.cs
trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerWindow.cs
trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui/ViewActions.cs
trunk/banshee/src/Core/Banshee.ThickClient/Resources/banshee-dialogs.glade
Modified: trunk/banshee/src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs
==============================================================================
--- trunk/banshee/src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs (original)
+++ trunk/banshee/src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs Fri Jan 25 01:35:54 2008
@@ -39,13 +39,13 @@
namespace Banshee.GStreamer
{
- internal delegate void GstPlaybackEosCallback(IntPtr engine);
- internal delegate void GstPlaybackErrorCallback(IntPtr engine, uint domain, int code, IntPtr error, IntPtr debug);
- internal delegate void GstPlaybackStateChangedCallback(IntPtr engine, int old_state, int new_state, int pending_state);
- internal delegate void GstPlaybackIterateCallback(IntPtr engine);
- internal delegate void GstPlaybackBufferingCallback(IntPtr engine, int buffering_progress);
+ internal delegate void GstPlaybackEosCallback (IntPtr engine);
+ internal delegate void GstPlaybackErrorCallback (IntPtr engine, uint domain, int code, IntPtr error, IntPtr debug);
+ internal delegate void GstPlaybackStateChangedCallback (IntPtr engine, int old_state, int new_state, int pending_state);
+ internal delegate void GstPlaybackIterateCallback (IntPtr engine);
+ internal delegate void GstPlaybackBufferingCallback (IntPtr engine, int buffering_progress);
- internal delegate void GstTaggerTagFoundCallback(string tagName, ref GLib.Value value, IntPtr userData);
+ internal delegate void GstTaggerTagFoundCallback (string tagName, ref GLib.Value value, IntPtr userData);
public class PlayerEngine : Banshee.MediaEngine.PlayerEngine, Banshee.MediaEngine.IEqualizer
{
@@ -65,66 +65,65 @@
private bool buffering_finished;
- public PlayerEngine()
+ public PlayerEngine ()
{
- if(ServiceManager.IsInitialized) {
- Initialize();
+ if (ServiceManager.IsInitialized) {
+ Initialize ();
} else {
ServiceManager.ServiceStarted += OnServiceStarted;
}
}
- private void OnServiceStarted(ServiceStartedArgs args)
+ private void OnServiceStarted (ServiceStartedArgs args)
{
- if(args.Service is Service) {
+ if (args.Service is Service) {
ServiceManager.ServiceStarted -= OnServiceStarted;
- Initialize();
+ Initialize ();
}
}
- private void Initialize()
+ private void Initialize ()
{
- IntPtr ptr = gst_playback_new();
+ IntPtr ptr = gst_playback_new ();
- if(ptr == IntPtr.Zero) {
- throw new ApplicationException(Catalog.GetString("Could not initialize GStreamer library"));
+ if (ptr == IntPtr.Zero) {
+ throw new ApplicationException (Catalog.GetString ("Could not initialize GStreamer library"));
}
- handle = new HandleRef(this, ptr);
+ handle = new HandleRef (this, ptr);
- gst_playback_get_error_quarks(out GST_CORE_ERROR, out GST_LIBRARY_ERROR,
+ gst_playback_get_error_quarks (out GST_CORE_ERROR, out GST_LIBRARY_ERROR,
out GST_RESOURCE_ERROR, out GST_STREAM_ERROR);
- eos_callback = new GstPlaybackEosCallback(OnEos);
- error_callback = new GstPlaybackErrorCallback(OnError);
- //state_changed_callback = new GstPlaybackStateChangedCallback(OnStateChanged);
- iterate_callback = new GstPlaybackIterateCallback(OnIterate);
- buffering_callback = new GstPlaybackBufferingCallback(OnBuffering);
- tag_found_callback = new GstTaggerTagFoundCallback(OnTagFound);
+ eos_callback = new GstPlaybackEosCallback (OnEos);
+ error_callback = new GstPlaybackErrorCallback (OnError);
+ iterate_callback = new GstPlaybackIterateCallback (OnIterate);
+ buffering_callback = new GstPlaybackBufferingCallback (OnBuffering);
+ tag_found_callback = new GstTaggerTagFoundCallback (OnTagFound);
- gst_playback_set_eos_callback(handle, eos_callback);
- gst_playback_set_iterate_callback(handle, iterate_callback);
- gst_playback_set_error_callback(handle, error_callback);
- gst_playback_set_state_changed_callback(handle, state_changed_callback);
- gst_playback_set_buffering_callback(handle, buffering_callback);
- gst_playback_set_tag_found_callback(handle, tag_found_callback);
+ gst_playback_set_eos_callback (handle, eos_callback);
+ gst_playback_set_iterate_callback (handle, iterate_callback);
+ gst_playback_set_error_callback (handle, error_callback);
+ gst_playback_set_state_changed_callback (handle, state_changed_callback);
+ gst_playback_set_buffering_callback (handle, buffering_callback);
+ gst_playback_set_tag_found_callback (handle, tag_found_callback);
- OnStateChanged(PlayerEngineState.Initalized);
+ OnStateChanged (PlayerEngineState.Initalized);
}
- public override void Dispose()
+ public override void Dispose ()
{
- base.Dispose();
- gst_playback_free(handle);
+ base.Dispose ();
+ gst_playback_free (handle);
}
- public override void Close()
+ public override void Close ()
{
- gst_playback_stop(handle);
- base.Close();
+ gst_playback_stop (handle);
+ base.Close ();
}
- protected override void OpenUri(SafeUri uri)
+ protected override void OpenUri (SafeUri uri)
{
// The GStreamer engine can use the XID of the main window if it ever
// needs to bring up the plugin installer so it can be transient to
@@ -135,57 +134,57 @@
gst_playback_set_gdk_window (handle, service.PropertyStore.Get<IntPtr> ("PrimaryWindow.RawHandle"));
}
- IntPtr uri_ptr = GLib.Marshaller.StringToPtrGStrdup(uri.AbsoluteUri);
- gst_playback_open(handle, uri_ptr);
- GLib.Marshaller.Free(uri_ptr);
+ IntPtr uri_ptr = GLib.Marshaller.StringToPtrGStrdup (uri.AbsoluteUri);
+ gst_playback_open (handle, uri_ptr);
+ GLib.Marshaller.Free (uri_ptr);
}
- public override void Play()
+ public override void Play ()
{
- gst_playback_play(handle);
- OnStateChanged(PlayerEngineState.Playing);
+ gst_playback_play (handle);
+ OnStateChanged (PlayerEngineState.Playing);
}
- public override void Pause()
+ public override void Pause ()
{
- gst_playback_pause(handle);
- OnStateChanged(PlayerEngineState.Paused);
+ gst_playback_pause (handle);
+ OnStateChanged (PlayerEngineState.Paused);
}
- public override IntPtr [] GetBaseElements()
+ public override IntPtr [] GetBaseElements ()
{
IntPtr [] elements = new IntPtr[3];
- if(gst_playback_get_pipeline_elements(handle, out elements[0], out elements[1], out elements[2])) {
+ if (gst_playback_get_pipeline_elements (handle, out elements[0], out elements[1], out elements[2])) {
return elements;
}
return null;
}
- private void OnEos(IntPtr engine)
+ private void OnEos (IntPtr engine)
{
- Close();
- OnEventChanged(PlayerEngineEvent.EndOfStream);
+ Close ();
+ OnEventChanged (PlayerEngineEvent.EndOfStream);
}
- private void OnIterate(IntPtr engine)
+ private void OnIterate (IntPtr engine)
{
- OnEventChanged(PlayerEngineEvent.Iterate);
+ OnEventChanged (PlayerEngineEvent.Iterate);
}
- private void OnError(IntPtr engine, uint domain, int code, IntPtr error, IntPtr debug)
+ private void OnError (IntPtr engine, uint domain, int code, IntPtr error, IntPtr debug)
{
- Close();
+ Close ();
string error_message = error == IntPtr.Zero
- ? Catalog.GetString("Unknown Error")
- : GLib.Marshaller.Utf8PtrToString(error);
+ ? Catalog.GetString ("Unknown Error")
+ : GLib.Marshaller.Utf8PtrToString (error);
- if(domain == GST_RESOURCE_ERROR) {
- GstResourceError domain_code = (GstResourceError)code;
- if(CurrentTrack != null) {
- switch(domain_code) {
+ if (domain == GST_RESOURCE_ERROR) {
+ GstResourceError domain_code = (GstResourceError) code;
+ if (CurrentTrack != null) {
+ switch (domain_code) {
case GstResourceError.NotFound:
CurrentTrack.PlaybackError = StreamPlaybackError.ResourceNotFound;
break;
@@ -194,11 +193,11 @@
}
}
- Console.WriteLine("GStreamer resource error: {0}", domain_code);
- } else if(domain == GST_STREAM_ERROR) {
- GstStreamError domain_code = (GstStreamError)code;
- if(CurrentTrack != null) {
- switch(domain_code) {
+ Log.Error (String.Format ("GStreamer resource error: {0}", domain_code), false);
+ } else if (domain == GST_STREAM_ERROR) {
+ GstStreamError domain_code = (GstStreamError) code;
+ if (CurrentTrack != null) {
+ switch (domain_code) {
case GstStreamError.CodecNotFound:
CurrentTrack.PlaybackError = StreamPlaybackError.CodecNotFound;
break;
@@ -207,11 +206,11 @@
}
}
- Console.WriteLine("GStreamer stream error: {0}", domain_code);
- } else if(domain == GST_CORE_ERROR) {
- GstCoreError domain_code = (GstCoreError)code;
- if(CurrentTrack != null) {
- switch(domain_code) {
+ Log.Error (String.Format("GStreamer stream error: {0}", domain_code), false);
+ } else if (domain == GST_CORE_ERROR) {
+ GstCoreError domain_code = (GstCoreError) code;
+ if (CurrentTrack != null) {
+ switch (domain_code) {
case GstCoreError.MissingPlugin:
CurrentTrack.PlaybackError = StreamPlaybackError.CodecNotFound;
break;
@@ -220,38 +219,34 @@
}
}
- if(domain_code != GstCoreError.MissingPlugin) {
- Console.WriteLine("GStreamer core error: {0}", (GstCoreError)code);
+ if (domain_code != GstCoreError.MissingPlugin) {
+ Log.Error (String.Format("GStreamer core error: {0}", (GstCoreError) code), false);
}
- } else if(domain == GST_LIBRARY_ERROR) {
- Console.WriteLine("GStreamer library error: {0}", (GstLibraryError)code);
+ } else if (domain == GST_LIBRARY_ERROR) {
+ Log.Error (String.Format("GStreamer library error: {0}", (GstLibraryError) code), false);
}
- OnEventChanged(PlayerEngineEvent.Error, error_message);
+ OnEventChanged (PlayerEngineEvent.Error, error_message);
}
- /*private void OnStateChanged(IntPtr engine, int new_state, int old_state, int pending_state)
+ private void OnBuffering (IntPtr engine, int progress)
{
- }*/
-
- private void OnBuffering(IntPtr engine, int progress)
- {
- if(buffering_finished && progress >= 100) {
+ if (buffering_finished && progress >= 100) {
return;
}
buffering_finished = progress >= 100;
- OnEventChanged(PlayerEngineEvent.Buffering, Catalog.GetString("Buffering"), (double)progress / 100.0);
+ OnEventChanged (PlayerEngineEvent.Buffering, Catalog.GetString ("Buffering"), (double) progress / 100.0);
}
- private void OnTagFound(string tagName, ref GLib.Value value, IntPtr userData)
+ private void OnTagFound (string tagName, ref GLib.Value value, IntPtr userData)
{
- OnTagFound(ProcessNativeTagResult(tagName, ref value));
+ OnTagFound(ProcessNativeTagResult (tagName, ref value));
}
- private static StreamTag ProcessNativeTagResult(string tagName, ref GLib.Value valueRaw)
+ private static StreamTag ProcessNativeTagResult (string tagName, ref GLib.Value valueRaw)
{
- if(tagName == String.Empty || tagName == null) {
+ if (tagName == String.Empty || tagName == null) {
return StreamTag.Zero;
}
@@ -263,7 +258,7 @@
return StreamTag.Zero;
}
- if(value == null) {
+ if (value == null) {
return StreamTag.Zero;
}
@@ -275,27 +270,27 @@
}
public override ushort Volume {
- get { return (ushort)gst_playback_get_volume(handle); }
+ get { return (ushort) gst_playback_get_volume (handle); }
set {
- gst_playback_set_volume(handle, (int)value);
- OnEventChanged(PlayerEngineEvent.Volume);
+ gst_playback_set_volume(handle, (int) value);
+ OnEventChanged (PlayerEngineEvent.Volume);
}
}
public override uint Position {
- get { return (uint)gst_playback_get_position(handle); }
+ get { return (uint) gst_playback_get_position(handle); }
set {
- gst_playback_set_position(handle, (ulong)value);
- OnEventChanged(PlayerEngineEvent.Seek);
+ gst_playback_set_position(handle, (ulong) value);
+ OnEventChanged (PlayerEngineEvent.Seek);
}
}
public override bool CanSeek {
- get { return gst_playback_can_seek(handle); }
+ get { return gst_playback_can_seek (handle); }
}
public override uint Length {
- get { return (uint)gst_playback_get_duration(handle); }
+ get { return (uint)gst_playback_get_duration (handle); }
}
public override string Id {
@@ -307,11 +302,11 @@
}
public override bool SupportsEqualizer {
- get { return gst_equalizer_is_supported(handle); }
+ get { return gst_equalizer_is_supported (handle); }
}
public double AmplifierLevel {
- set { gst_equalizer_set_preamp_level(handle, value); }
+ set { gst_equalizer_set_preamp_level (handle, value); }
}
public int [] BandRange {
@@ -320,7 +315,7 @@
int min = -1;
int max = -1;
- gst_equalizer_get_bandrange(handle, out min, out max);
+ gst_equalizer_get_bandrange (handle, out min, out max);
return new int[] { min, max };
}
@@ -330,22 +325,22 @@
get
{
double[] freq = new double[10];
- gst_equalizer_get_frequencies(handle, out freq);
+ gst_equalizer_get_frequencies (handle, out freq);
uint[] ret = new uint[freq.Length];
- for(int i = 0; i < freq.Length; i++)
+ for (int i = 0; i < freq.Length; i++)
{
- ret[i] = (uint)freq[i];
+ ret[i] = (uint) freq[i];
}
return ret;
}
}
- public void SetEqualizerGain(uint band, double gain)
+ public void SetEqualizerGain (uint band, double gain)
{
- gst_equalizer_set_gain(handle, band, gain);
+ gst_equalizer_set_gain (handle, band, gain);
}
private static string [] source_capabilities = { "file", "http", "cdda" };
@@ -359,84 +354,88 @@
}
[DllImport("libbanshee")]
- private static extern IntPtr gst_playback_new();
+ private static extern IntPtr gst_playback_new ();
[DllImport("libbanshee")]
- private static extern void gst_playback_free(HandleRef engine);
+ private static extern void gst_playback_free (HandleRef engine);
[DllImport("libbanshee")]
- private static extern void gst_playback_set_eos_callback(HandleRef engine, GstPlaybackEosCallback cb);
+ private static extern void gst_playback_set_eos_callback (HandleRef engine, GstPlaybackEosCallback cb);
[DllImport("libbanshee")]
- private static extern void gst_playback_set_error_callback(HandleRef engine, GstPlaybackErrorCallback cb);
+ private static extern void gst_playback_set_error_callback (HandleRef engine, GstPlaybackErrorCallback cb);
[DllImport("libbanshee")]
- private static extern void gst_playback_set_state_changed_callback(HandleRef engine,
+ private static extern void gst_playback_set_state_changed_callback (HandleRef engine,
GstPlaybackStateChangedCallback cb);
[DllImport("libbanshee")]
- private static extern void gst_playback_set_iterate_callback(HandleRef engine, GstPlaybackIterateCallback cb);
+ private static extern void gst_playback_set_iterate_callback (HandleRef engine,
+ GstPlaybackIterateCallback cb);
[DllImport("libbanshee")]
- private static extern void gst_playback_set_buffering_callback(HandleRef engine, GstPlaybackBufferingCallback cb);
+ private static extern void gst_playback_set_buffering_callback (HandleRef engine,
+ GstPlaybackBufferingCallback cb);
[DllImport("libbanshee")]
- private static extern void gst_playback_set_tag_found_callback(HandleRef engine, GstTaggerTagFoundCallback cb);
+ private static extern void gst_playback_set_tag_found_callback (HandleRef engine,
+ GstTaggerTagFoundCallback cb);
[DllImport("libbanshee")]
- private static extern void gst_playback_open(HandleRef engine, IntPtr uri);
+ private static extern void gst_playback_open (HandleRef engine, IntPtr uri);
[DllImport("libbanshee")]
- private static extern void gst_playback_stop(HandleRef engine);
+ private static extern void gst_playback_stop (HandleRef engine);
[DllImport("libbanshee")]
- private static extern void gst_playback_pause(HandleRef engine);
+ private static extern void gst_playback_pause (HandleRef engine);
[DllImport("libbanshee")]
- private static extern void gst_playback_play(HandleRef engine);
+ private static extern void gst_playback_play (HandleRef engine);
[DllImport("libbanshee")]
- private static extern void gst_playback_set_volume(HandleRef engine, int volume);
+ private static extern void gst_playback_set_volume (HandleRef engine, int volume);
[DllImport("libbanshee")]
- private static extern int gst_playback_get_volume(HandleRef engine);
+ private static extern int gst_playback_get_volume (HandleRef engine);
[DllImport("libbanshee")]
- private static extern bool gst_playback_can_seek(HandleRef engine);
+ private static extern bool gst_playback_can_seek (HandleRef engine);
[DllImport("libbanshee")]
- private static extern void gst_playback_set_position(HandleRef engine, ulong time_ms);
+ private static extern void gst_playback_set_position (HandleRef engine, ulong time_ms);
[DllImport("libbanshee")]
- private static extern ulong gst_playback_get_position(HandleRef engine);
+ private static extern ulong gst_playback_get_position (HandleRef engine);
[DllImport("libbanshee")]
- private static extern ulong gst_playback_get_duration(HandleRef engine);
+ private static extern ulong gst_playback_get_duration (HandleRef engine);
[DllImport("libbanshee")]
- private static extern bool gst_playback_get_pipeline_elements(HandleRef engine, out IntPtr playbin,
+ private static extern bool gst_playback_get_pipeline_elements (HandleRef engine, out IntPtr playbin,
out IntPtr audiobin, out IntPtr audiotee);
[DllImport("libbanshee")]
- private static extern void gst_playback_set_gdk_window(HandleRef engine, IntPtr window);
+ private static extern void gst_playback_set_gdk_window (HandleRef engine, IntPtr window);
[DllImport("libbanshee")]
- private static extern void gst_playback_get_error_quarks(out uint core, out uint library,
+ private static extern void gst_playback_get_error_quarks (out uint core, out uint library,
out uint resource, out uint stream);
[DllImport("libbanshee")]
- private static extern bool gst_equalizer_is_supported(HandleRef engine);
+ private static extern bool gst_equalizer_is_supported (HandleRef engine);
[DllImport("libbanshee")]
- private static extern void gst_equalizer_set_preamp_level(HandleRef engine, double level);
+ private static extern void gst_equalizer_set_preamp_level (HandleRef engine, double level);
[DllImport("libbanshee")]
- private static extern void gst_equalizer_set_gain(HandleRef engine, uint bandnum, double gain);
+ private static extern void gst_equalizer_set_gain (HandleRef engine, uint bandnum, double gain);
[DllImport("libbanshee")]
- private static extern void gst_equalizer_get_bandrange(HandleRef engine, out int min, out int max);
+ private static extern void gst_equalizer_get_bandrange (HandleRef engine, out int min, out int max);
[DllImport("libbanshee")]
- private static extern void gst_equalizer_get_frequencies(HandleRef engine, [MarshalAs(UnmanagedType.LPArray)] out double[] freq);
+ private static extern void gst_equalizer_get_frequencies (HandleRef engine,
+ [MarshalAs(UnmanagedType.LPArray)] out double[] freq);
}
}
Modified: trunk/banshee/src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs (original)
+++ trunk/banshee/src/Core/Banshee.Services/Banshee.Equalizer/EqualizerManager.cs Fri Jan 25 01:35:54 2008
@@ -41,7 +41,7 @@
{
public class EqualizerManager : IEnumerable<EqualizerSetting>, IEnumerable
{
- private List<EqualizerSetting> equalizers = new List<EqualizerSetting>();
+ private List<EqualizerSetting> equalizers = new List<EqualizerSetting> ();
private string path;
public event EqualizerSettingEventHandler EqualizerAdded;
@@ -51,8 +51,8 @@
private static EqualizerManager instance;
public static EqualizerManager Instance {
get {
- if(instance == null) {
- instance = new EqualizerManager(System.IO.Path.Combine(
+ if (instance == null) {
+ instance = new EqualizerManager (System.IO.Path.Combine (
Paths.ApplicationData, "equalizers.xml"));
}
@@ -60,70 +60,69 @@
}
}
- public EqualizerManager()
+ public EqualizerManager ()
{
}
- public EqualizerManager(string path)
+ public EqualizerManager (string path)
{
this.path = path;
try {
- Load();
+ Load ();
} catch {
}
}
- public void Add(EqualizerSetting eq)
+ public void Add (EqualizerSetting eq)
{
eq.Changed += OnEqualizerSettingChanged;
- equalizers.Add(eq);
- QueueSave();
- OnEqualizerAdded(eq);
+ equalizers.Add (eq);
+ QueueSave ();
+ OnEqualizerAdded (eq);
}
- public void Remove(EqualizerSetting eq)
+ public void Remove (EqualizerSetting eq)
{
- Remove(eq, true);
+ Remove (eq, true);
}
- private void Remove(EqualizerSetting eq, bool shouldQueueSave)
+ private void Remove (EqualizerSetting eq, bool shouldQueueSave)
{
- if(eq == null) {
+ if (eq == null) {
return;
}
eq.Changed -= OnEqualizerSettingChanged;
- equalizers.Remove(eq);
- OnEqualizerRemoved(eq);
+ equalizers.Remove (eq);
+ OnEqualizerRemoved (eq);
- if(shouldQueueSave) {
- QueueSave();
+ if (shouldQueueSave) {
+ QueueSave ();
}
}
- public void Clear()
+ public void Clear ()
{
- while(equalizers.Count > 0) {
- Remove(equalizers[0], false);
+ while (equalizers.Count > 0) {
+ Remove (equalizers[0], false);
}
- QueueSave();
+ QueueSave ();
}
- public void Enable(EqualizerSetting eq)
+ public void Enable (EqualizerSetting eq)
{
- if (eq != null)
- {
+ if (eq != null) {
eq.Enabled = true;
// Make a copy of the Dictionary first, otherwise it'll become out of sync
// when we begin to change the gain on the bands.
- Dictionary<uint, double> bands = new Dictionary<uint, double>(eq.Bands);
+ Dictionary<uint, double> bands = new Dictionary<uint, double> (eq.Bands);
foreach(KeyValuePair<uint, double> band in bands)
{
- eq.SetGain(band.Key, band.Value);
+ eq.SetGain (band.Key, band.Value);
}
// Reset preamp.
@@ -131,154 +130,153 @@
}
}
- public void Disable(EqualizerSetting eq)
+ public void Disable (EqualizerSetting eq)
{
- if (eq != null)
- {
+ if (eq != null) {
eq.Enabled = false;
// Set the actual equalizer gain on all bands to 0 dB,
// but don't change the gain in the dictionary (we can use/change those values
// later, but not affect the actual audio stream until we're enabled again).
- for(uint i = 0; i < eq.BandCount; i++)
+ for (uint i = 0; i < eq.BandCount; i++)
{
- ((IEqualizer)ServiceManager.PlayerEngine.ActiveEngine).SetEqualizerGain(i, 0);
+ ((IEqualizer) ServiceManager.PlayerEngine.ActiveEngine).SetEqualizerGain (i, 0);
}
- ((IEqualizer)ServiceManager.PlayerEngine.ActiveEngine).AmplifierLevel = 1D;
+ ((IEqualizer) ServiceManager.PlayerEngine.ActiveEngine).AmplifierLevel = 1D;
}
}
- public void Load()
+ public void Load ()
{
- Load(path);
+ Load (path);
}
- public void Load(string path)
+ public void Load (string path)
{
- XmlDocument doc = new XmlDocument();
- doc.Load(path);
+ XmlDocument doc = new XmlDocument ();
+ doc.Load (path);
- Clear();
+ Clear ();
- foreach(XmlNode node in doc.DocumentElement.ChildNodes) {
+ foreach (XmlNode node in doc.DocumentElement.ChildNodes) {
if(node.Name != "equalizer") {
- throw new XmlException("equalizer node was expected");
+ throw new XmlException ("equalizer node was expected");
}
- EqualizerSetting eq = new EqualizerSetting(node.Attributes["name"].Value);
+ EqualizerSetting eq = new EqualizerSetting (node.Attributes["name"].Value);
- foreach(XmlNode child in node) {
- if(child.Name == "preamp") {
- eq.AmplifierLevel = Convert.ToDouble(child.InnerText);
- } else if(child.Name == "band") {
- eq.SetGain(Convert.ToUInt32(child.Attributes["num"].Value),
- Convert.ToDouble(child.InnerText));
+ foreach (XmlNode child in node) {
+ if (child.Name == "preamp") {
+ eq.AmplifierLevel = Convert.ToDouble (child.InnerText);
+ } else if (child.Name == "band") {
+ eq.SetGain (Convert.ToUInt32 (child.Attributes["num"].Value),
+ Convert.ToDouble (child.InnerText));
} else {
- throw new XmlException("Invalid node, expected one of preamp or band");
+ throw new XmlException ("Invalid node, expected one of preamp or band");
}
}
- Add(eq);
+ Add (eq);
}
}
- public void Save()
+ public void Save ()
{
- Save(path);
+ Save (path);
}
- public void Save(string path)
+ public void Save (string path)
{
- XmlDocument doc = new XmlDocument();
- XmlNode root = doc.CreateNode(XmlNodeType.Element, "equalizers", null);
- doc.AppendChild(root);
+ XmlDocument doc = new XmlDocument ();
+ XmlNode root = doc.CreateNode (XmlNodeType.Element, "equalizers", null);
+ doc.AppendChild (root);
- foreach(EqualizerSetting eq in this) {
- XmlNode root_node = doc.CreateNode(XmlNodeType.Element, "equalizer", null);
+ foreach (EqualizerSetting eq in this) {
+ XmlNode root_node = doc.CreateNode (XmlNodeType.Element, "equalizer", null);
- XmlAttribute name_node = doc.CreateAttribute("name");
+ XmlAttribute name_node = doc.CreateAttribute ("name");
name_node.Value = eq.Name;
- XmlNode preamp_node = doc.CreateNode(XmlNodeType.Element, "preamp", null);
- XmlNode preamp_node_value = doc.CreateNode(XmlNodeType.Text, "value", null);
- preamp_node_value.Value = Convert.ToString(eq.AmplifierLevel);
- preamp_node.AppendChild(preamp_node_value);
+ XmlNode preamp_node = doc.CreateNode (XmlNodeType.Element, "preamp", null);
+ XmlNode preamp_node_value = doc.CreateNode (XmlNodeType.Text, "value", null);
+ preamp_node_value.Value = Convert.ToString (eq.AmplifierLevel);
+ preamp_node.AppendChild (preamp_node_value);
- root_node.Attributes.Append(name_node);
- root_node.AppendChild(preamp_node);
+ root_node.Attributes.Append (name_node);
+ root_node.AppendChild (preamp_node);
- foreach(KeyValuePair<uint, double> band in eq.Bands) {
- XmlNode band_node = doc.CreateNode(XmlNodeType.Element, "band", null);
- XmlNode band_node_value = doc.CreateNode(XmlNodeType.Text, "value", null);
- band_node_value.Value = Convert.ToString(band.Value);
- band_node.AppendChild(band_node_value);
+ foreach (KeyValuePair<uint, double> band in eq.Bands) {
+ XmlNode band_node = doc.CreateNode (XmlNodeType.Element, "band", null);
+ XmlNode band_node_value = doc.CreateNode (XmlNodeType.Text, "value", null);
+ band_node_value.Value = Convert.ToString (band.Value);
+ band_node.AppendChild (band_node_value);
- XmlAttribute frequency_node = doc.CreateAttribute("num");
- frequency_node.Value = Convert.ToString(band.Key);
- band_node.Attributes.Append(frequency_node);
+ XmlAttribute frequency_node = doc.CreateAttribute ("num");
+ frequency_node.Value = Convert.ToString (band.Key);
+ band_node.Attributes.Append (frequency_node);
- root_node.AppendChild(band_node);
+ root_node.AppendChild (band_node);
}
- root.AppendChild(root_node);
+ root.AppendChild (root_node);
}
- doc.Save(path);
+ doc.Save (path);
}
- protected virtual void OnEqualizerAdded(EqualizerSetting eq)
+ protected virtual void OnEqualizerAdded (EqualizerSetting eq)
{
EqualizerSettingEventHandler handler = EqualizerAdded;
- if(handler != null) {
- handler(this, new EqualizerSettingEventArgs(eq));
+ if (handler != null) {
+ handler (this, new EqualizerSettingEventArgs (eq));
}
}
- protected virtual void OnEqualizerRemoved(EqualizerSetting eq)
+ protected virtual void OnEqualizerRemoved (EqualizerSetting eq)
{
EqualizerSettingEventHandler handler = EqualizerRemoved;
- if(handler != null) {
- handler(this, new EqualizerSettingEventArgs(eq));
+ if (handler != null) {
+ handler (this, new EqualizerSettingEventArgs (eq));
}
}
- protected virtual void OnEqualizerChanged(EqualizerSetting eq)
+ protected virtual void OnEqualizerChanged (EqualizerSetting eq)
{
EqualizerSettingEventHandler handler = EqualizerChanged;
- if(handler != null) {
- handler(this, new EqualizerSettingEventArgs(eq));
+ if (handler != null) {
+ handler (this, new EqualizerSettingEventArgs (eq));
}
}
- private void OnEqualizerSettingChanged(object o, EventArgs args)
+ private void OnEqualizerSettingChanged (object o, EventArgs args)
{
- OnEqualizerChanged(o as EqualizerSetting);
- QueueSave();
+ OnEqualizerChanged (o as EqualizerSetting);
+ QueueSave ();
}
private uint queue_save_id = 0;
- private void QueueSave()
+ private void QueueSave ()
{
- if(queue_save_id > 0) {
+ if (queue_save_id > 0) {
return;
}
- queue_save_id = GLib.Timeout.Add(2500, delegate {
- Save();
+ queue_save_id = GLib.Timeout.Add (2500, delegate {
+ Save ();
queue_save_id = 0;
return false;
});
}
- IEnumerator IEnumerable.GetEnumerator()
+ IEnumerator IEnumerable.GetEnumerator ()
{
- return equalizers.GetEnumerator();
+ return equalizers.GetEnumerator ();
}
- public IEnumerator<EqualizerSetting> GetEnumerator()
+ public IEnumerator<EqualizerSetting> GetEnumerator ()
{
- return equalizers.GetEnumerator();
+ return equalizers.GetEnumerator ();
}
public string Path {
Modified: trunk/banshee/src/Core/Banshee.Services/Banshee.Equalizer/EqualizerSetting.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.Services/Banshee.Equalizer/EqualizerSetting.cs (original)
+++ trunk/banshee/src/Core/Banshee.Services/Banshee.Equalizer/EqualizerSetting.cs Fri Jan 25 01:35:54 2008
@@ -38,20 +38,19 @@
public class EqualizerSetting
{
private string name;
- private Dictionary<uint, double> bands = new Dictionary<uint, double>();
- private double amp = 1; // dB multiplier (0db is mute, 2dB is 2x normal volume?)
+ private Dictionary<uint, double> bands = new Dictionary<uint, double> ();
+ private double amp = 1; // dB multiplier (0db is mute, 1db is no change - passthrough)
private bool enabled = true;
private const uint bandcount = 10;
public event EventHandler Changed;
- public EqualizerSetting(string name)
+ public EqualizerSetting (string name)
{
this.name = name;
// Fill in 0 dB for all bands at init.
- for (uint i = 0; i < bandcount; i++)
- {
+ for (uint i = 0; i < bandcount; i++) {
bands.Add(i, 0);
}
}
@@ -64,8 +63,8 @@
set
{
name = value;
- PresetSchema.Set(this.name);
- OnChanged();
+ PresetSchema.Set (this.name);
+ OnChanged ();
}
}
@@ -74,10 +73,10 @@
set
{
enabled = value;
- EnabledSchema.Set(value);
+ EnabledSchema.Set (value);
// Make this the new default preset (last changed).
- PresetSchema.Set(this.name);
+ PresetSchema.Set (this.name);
}
}
@@ -93,18 +92,14 @@
/// Sets/gets the preamp gain.
/// </summary>
public double AmplifierLevel {
- get
- {
- return amp;
- }
+ get { return amp; }
set
{
amp = value;
- if (enabled)
- {
- ((IEqualizer)ServiceManager.PlayerEngine.ActiveEngine).AmplifierLevel = value;
+ if (enabled) {
+ ((IEqualizer) ServiceManager.PlayerEngine.ActiveEngine).AmplifierLevel = value;
}
- OnChanged();
+ OnChanged ();
}
}
@@ -113,48 +108,43 @@
/// </summary>
/// <param name="band">The band to adjust gain.</param>
/// <param name="val">The value in dB to set the band gain to.</param>
- public void SetGain(uint band, double val)
+ public void SetGain (uint band, double val)
{
- if (bands.ContainsKey(band))
- {
+ if (bands.ContainsKey (band)) {
bands[band] = val;
- }
- else
- {
- bands.Add(band, val);
+ } else {
+ bands.Add (band, val);
}
// Tell engine that we've changed.
- if (enabled)
- {
- ((IEqualizer)ServiceManager.PlayerEngine.ActiveEngine).SetEqualizerGain(band, val);
+ if (enabled) {
+ ((IEqualizer) ServiceManager.PlayerEngine.ActiveEngine).SetEqualizerGain (band, val);
}
- OnChanged();
+ OnChanged ();
}
public double this[uint band] {
get { return bands[band]; }
- set { SetGain(band, value); }
+ set { SetGain (band, value); }
}
- protected virtual void OnChanged()
+ protected virtual void OnChanged ()
{
EventHandler handler = Changed;
- if (handler != null)
- {
- handler(this, new EventArgs());
+ if (handler != null) {
+ handler (this, new EventArgs ());
}
}
- public static readonly SchemaEntry<bool> EnabledSchema = new SchemaEntry<bool>(
+ public static readonly SchemaEntry<bool> EnabledSchema = new SchemaEntry<bool> (
"player", "equalizer_enabled",
false,
"Equalizer status",
"Whether or not the equalizer is set to be enabled."
);
- public static readonly SchemaEntry<string> PresetSchema = new SchemaEntry<string>(
+ public static readonly SchemaEntry<string> PresetSchema = new SchemaEntry<string> (
"player", "equalizer_preset",
"",
"Equalizer preset",
Modified: trunk/banshee/src/Core/Banshee.Services/Banshee.Equalizer/EqualizerSettingEvent.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.Services/Banshee.Equalizer/EqualizerSettingEvent.cs (original)
+++ trunk/banshee/src/Core/Banshee.Services/Banshee.Equalizer/EqualizerSettingEvent.cs Fri Jan 25 01:35:54 2008
@@ -30,13 +30,13 @@
namespace Banshee.Equalizer
{
- public delegate void EqualizerSettingEventHandler(object o, EqualizerSettingEventArgs args);
+ public delegate void EqualizerSettingEventHandler (object o, EqualizerSettingEventArgs args);
public class EqualizerSettingEventArgs : EventArgs
{
private EqualizerSetting eq;
- public EqualizerSettingEventArgs(EqualizerSetting eq)
+ public EqualizerSettingEventArgs (EqualizerSetting eq)
{
this.eq = eq;
}
@@ -45,4 +45,4 @@
get { return eq; }
}
}
-}
\ No newline at end of file
+}
Modified: trunk/banshee/src/Core/Banshee.Services/Banshee.MediaEngine/IEqualizer.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.Services/Banshee.MediaEngine/IEqualizer.cs (original)
+++ trunk/banshee/src/Core/Banshee.Services/Banshee.MediaEngine/IEqualizer.cs Fri Jan 25 01:35:54 2008
@@ -36,7 +36,7 @@
/// <summary>
/// Sets the gain of an equalizer band.
/// </summary>
- void SetEqualizerGain(uint band, double value);
+ void SetEqualizerGain (uint band, double value);
/// <summary>
/// Whether or not the engine supports the equalizer.
Modified: trunk/banshee/src/Core/Banshee.Services/Banshee.MediaEngine/PlayerEngine.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.Services/Banshee.MediaEngine/PlayerEngine.cs (original)
+++ trunk/banshee/src/Core/Banshee.Services/Banshee.MediaEngine/PlayerEngine.cs Fri Jan 25 01:35:54 2008
@@ -46,158 +46,159 @@
private PlayerEngineState current_state = PlayerEngineState.Idle;
private PlayerEngineState last_state = PlayerEngineState.Idle;
- protected abstract void OpenUri(SafeUri uri);
+ protected abstract void OpenUri (SafeUri uri);
- public void Reset()
+ public void Reset ()
{
current_track = null;
current_uri = null;
- OnStateChanged(PlayerEngineState.Idle);
+ OnStateChanged (PlayerEngineState.Idle);
}
- public virtual void Close()
+ public virtual void Close ()
{
- OnStateChanged(PlayerEngineState.Idle);
+ OnStateChanged (PlayerEngineState.Idle);
}
- public virtual void Dispose()
+ public virtual void Dispose ()
{
- Close();
+ Close ();
}
- public void Open(TrackInfo track)
+ public void Open (TrackInfo track)
{
current_uri = track.Uri;
current_track = track;
- HandleOpen(track.Uri);
+ HandleOpen (track.Uri);
}
- public void Open(SafeUri uri)
+ public void Open (SafeUri uri)
{
current_uri = uri;
- current_track = new UnknownTrackInfo(uri);
+ current_track = new UnknownTrackInfo (uri);
- HandleOpen(uri);
+ HandleOpen (uri);
}
- private void HandleOpen(SafeUri uri)
+ private void HandleOpen (SafeUri uri)
{
- if(current_state != PlayerEngineState.Idle) {
- Close();
+ if (current_state != PlayerEngineState.Idle) {
+ Close ();
}
try {
- OpenUri(uri);
- OnEventChanged(PlayerEngineEvent.StartOfStream);
- OnStateChanged(PlayerEngineState.Loaded);
- } catch(Exception e) {
- Console.WriteLine(e);
- OnEventChanged(PlayerEngineEvent.Error, e.Message);
+ OpenUri (uri);
+ OnEventChanged (PlayerEngineEvent.StartOfStream);
+ OnStateChanged (PlayerEngineState.Loaded);
+ } catch (Exception e) {
+ Console.WriteLine (e);
+ OnEventChanged (PlayerEngineEvent.Error, e.Message);
}
}
- public virtual void Play()
+ public virtual void Play ()
{
- OnStateChanged(PlayerEngineState.Playing);
+ OnStateChanged (PlayerEngineState.Playing);
}
- public virtual void Pause()
+ public virtual void Pause ()
{
- OnStateChanged(PlayerEngineState.Paused);
+ OnStateChanged (PlayerEngineState.Paused);
}
- public virtual IntPtr [] GetBaseElements()
+ public virtual IntPtr [] GetBaseElements ()
{
return null;
}
- protected virtual void OnStateChanged(PlayerEngineState state)
+ protected virtual void OnStateChanged (PlayerEngineState state)
{
- if(current_state == state) {
+ if (current_state == state) {
return;
}
- if(ThreadAssist.InMainThread) {
- RaiseStateChanged(state);
+ if (ThreadAssist.InMainThread) {
+ RaiseStateChanged (state);
} else {
- ThreadAssist.ProxyToMain(delegate {
- RaiseStateChanged(state);
+ ThreadAssist.ProxyToMain (delegate {
+ RaiseStateChanged (state);
});
}
}
- private void RaiseStateChanged(PlayerEngineState state)
+ private void RaiseStateChanged (PlayerEngineState state)
{
last_state = current_state;
current_state = state;
PlayerEngineStateHandler handler = StateChanged;
- if(handler != null) {
- PlayerEngineStateArgs args = new PlayerEngineStateArgs();
+ if (handler != null) {
+ PlayerEngineStateArgs args = new PlayerEngineStateArgs ();
args.State = state;
- handler(this, args);
+ handler (this, args);
}
}
- protected void OnEventChanged(PlayerEngineEvent evnt)
+ protected void OnEventChanged (PlayerEngineEvent evnt)
{
- OnEventChanged(evnt, null, 0.0);
+ OnEventChanged (evnt, null, 0.0);
}
- protected void OnEventChanged(PlayerEngineEvent evnt, string message)
+ protected void OnEventChanged (PlayerEngineEvent evnt, string message)
{
- OnEventChanged(evnt, message, 0.0);
+ OnEventChanged (evnt, message, 0.0);
}
- protected virtual void OnEventChanged(PlayerEngineEvent evnt, string message, double bufferingPercent)
+ protected virtual void OnEventChanged (PlayerEngineEvent evnt, string message, double bufferingPercent)
{
- if(ThreadAssist.InMainThread) {
- RaiseEventChanged(evnt, message, bufferingPercent);
+ if (ThreadAssist.InMainThread) {
+ RaiseEventChanged (evnt, message, bufferingPercent);
} else {
- ThreadAssist.ProxyToMain(delegate {
- RaiseEventChanged(evnt, message, bufferingPercent);
+ ThreadAssist.ProxyToMain (delegate {
+ RaiseEventChanged (evnt, message, bufferingPercent);
});
}
}
- private void RaiseEventChanged(PlayerEngineEvent evnt, string message, double bufferingPercent)
+ private void RaiseEventChanged (PlayerEngineEvent evnt, string message, double bufferingPercent)
{
PlayerEngineEventHandler handler = EventChanged;
- if(handler != null) {
- PlayerEngineEventArgs args = new PlayerEngineEventArgs();
+ if (handler != null) {
+ PlayerEngineEventArgs args = new PlayerEngineEventArgs ();
args.Event = evnt;
args.Message = message;
args.BufferingPercent = bufferingPercent;
- handler(this, args);
+ handler (this, args);
}
}
private uint track_info_updated_timeout = 0;
- protected void OnTagFound(StreamTag tag)
+ protected void OnTagFound (StreamTag tag)
{
- if(tag.Equals(StreamTag.Zero) || current_track == null || current_track.Attributes & TrackAttributes.IsLive == 0) {
- return;
+ if (tag.Equals (StreamTag.Zero) || current_track == null ||
+ current_track.Attributes & TrackAttributes.IsLive == 0) {
+ return;
}
- StreamTagger.TrackInfoMerge(current_track, tag);
+ StreamTagger.TrackInfoMerge (current_track, tag);
- if(track_info_updated_timeout <= 0) {
- track_info_updated_timeout = Application.RunTimeout(500, OnTrackInfoUpdated);
+ if (track_info_updated_timeout <= 0) {
+ track_info_updated_timeout = Application.RunTimeout (500, OnTrackInfoUpdated);
}
}
- private bool OnTrackInfoUpdated()
+ private bool OnTrackInfoUpdated ()
{
- TrackInfoUpdated();
+ TrackInfoUpdated ();
track_info_updated_timeout = 0;
return false;
}
- public void TrackInfoUpdated()
+ public void TrackInfoUpdated ()
{
- OnEventChanged(PlayerEngineEvent.TrackInfoUpdated);
+ OnEventChanged (PlayerEngineEvent.TrackInfoUpdated);
}
public TrackInfo CurrentTrack {
Modified: trunk/banshee/src/Core/Banshee.Services/Banshee.MediaEngine/PlayerEngineService.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.Services/Banshee.MediaEngine/PlayerEngineService.cs (original)
+++ trunk/banshee/src/Core/Banshee.Services/Banshee.MediaEngine/PlayerEngineService.cs Fri Jan 25 01:35:54 2008
@@ -46,7 +46,7 @@
{
public class PlayerEngineService : IService, IPlayerEngineService
{
- private List<PlayerEngine> engines = new List<PlayerEngine>();
+ private List<PlayerEngine> engines = new List<PlayerEngine> ();
private PlayerEngine active_engine;
private PlayerEngine default_engine;
private PlayerEngine pending_engine;
@@ -69,26 +69,26 @@
remove { dbus_state_changed -= value; }
}
- public PlayerEngineService()
+ public PlayerEngineService ()
{
preferred_engine_id = EngineSchema.Get();
- if(default_engine == null && engines.Count > 0) {
+ if (default_engine == null && engines.Count > 0) {
default_engine = engines[0];
}
- foreach(TypeExtensionNode node in AddinManager.GetExtensionNodes ("/Banshee/PlayerEngines/PlayerEngine")) {
- LoadEngine(node);
+ foreach (TypeExtensionNode node in AddinManager.GetExtensionNodes ("/Banshee/PlayerEngines/PlayerEngine")) {
+ LoadEngine (node);
}
- if(default_engine != null) {
+ if (default_engine != null) {
active_engine = default_engine;
- Log.Debug(Catalog.GetString("Default player engine"), active_engine.Name);
+ Log.Debug (Catalog.GetString ("Default player engine"), active_engine.Name);
} else {
default_engine = active_engine;
}
- if(default_engine == null || active_engine == null || engines == null || engines.Count == 0) {
+ if (default_engine == null || active_engine == null || engines == null || engines.Count == 0) {
throw new ApplicationException(Catalog.GetString(
"No player engines were found. Please ensure Banshee has been cleanly installed."));
}
@@ -96,9 +96,9 @@
MetadataService.Instance.HaveResult += OnMetadataServiceHaveResult;
}
- private void LoadEngine(TypeExtensionNode node)
+ private void LoadEngine (TypeExtensionNode node)
{
- PlayerEngine engine = (PlayerEngine)node.CreateInstance(typeof(PlayerEngine));
+ PlayerEngine engine = (PlayerEngine) node.CreateInstance (typeof (PlayerEngine));
engine.StateChanged += OnEngineStateChanged;
engine.EventChanged += OnEngineEventChanged;
@@ -109,69 +109,64 @@
if (active_engine == null) {
active_engine = engine;
}
- engines.Add(engine);
+ engines.Add (engine);
}
}
- public void Dispose()
+ public void Dispose ()
{
}
- private void OnMetadataServiceHaveResult(object o, MetadataLookupResultArgs args)
+ private void OnMetadataServiceHaveResult (object o, MetadataLookupResultArgs args)
{
- if(CurrentTrack != null && args.Track == CurrentTrack) {
- foreach(StreamTag tag in args.ResultTags) {
+ if (CurrentTrack != null && args.Track == CurrentTrack) {
+ foreach (StreamTag tag in args.ResultTags) {
StreamTagger.TrackInfoMerge(CurrentTrack, tag);
}
- PlayerEngineEventArgs eventargs = new PlayerEngineEventArgs();
+ PlayerEngineEventArgs eventargs = new PlayerEngineEventArgs ();
eventargs.Event = PlayerEngineEvent.TrackInfoUpdated;
- OnEngineEventChanged(active_engine, eventargs);
+ OnEngineEventChanged (active_engine, eventargs);
}
}
- private void OnEngineStateChanged(object o, PlayerEngineStateArgs args)
+ private void OnEngineStateChanged (object o, PlayerEngineStateArgs args)
{
- if(o != active_engine) {
+ if (o != active_engine) {
return;
}
- if(args.State == PlayerEngineState.Loaded && CurrentTrack != null) {
- active_engine.Volume = (ushort)VolumeSchema.Get ();
- MetadataService.Instance.Lookup(CurrentTrack);
+ if (args.State == PlayerEngineState.Loaded && CurrentTrack != null) {
+ active_engine.Volume = (ushort) VolumeSchema.Get ();
+ MetadataService.Instance.Lookup (CurrentTrack);
} else if (args.State == PlayerEngineState.Initalized) {
// Enable our preferred equalizer if it exists and was enabled last time.
- if (this.SupportsEqualizer && EqualizerSetting.EnabledSchema.Get())
- {
+ if (this.SupportsEqualizer && EqualizerSetting.EnabledSchema.Get ()) {
string name = EqualizerSetting.PresetSchema.Get();
- if (name != "")
- {
+ if (name != "") {
// Don't use EqualizerManager.Instance - used by the eq dialog window.
- EqualizerManager manager = new EqualizerManager(EqualizerManager.Instance.Path);
- manager.Load();
+ EqualizerManager manager = new EqualizerManager (EqualizerManager.Instance.Path);
+ manager.Load ();
EqualizerSetting equalizer = null;
- foreach(EqualizerSetting eq in manager)
- {
- if (eq.Name == name)
- {
+ foreach (EqualizerSetting eq in manager) {
+ if (eq.Name == name) {
equalizer = eq;
break;
}
}
- if (equalizer != null)
- {
- Log.DebugFormat("Enabling equalizer preset: {0}", equalizer.Name);
- manager.Enable(equalizer);
+ if (equalizer != null) {
+ Log.DebugFormat ("Enabling equalizer preset: {0}", equalizer.Name);
+ manager.Enable (equalizer);
}
}
}
}
PlayerEngineStateHandler handler = StateChanged;
- if(handler != null) {
- handler(o, args);
+ if (handler != null) {
+ handler (o, args);
}
DBusPlayerEngineStateHandler dbus_handler = dbus_state_changed;
@@ -180,24 +175,24 @@
}
}
- private void OnEngineEventChanged(object o, PlayerEngineEventArgs args)
+ private void OnEngineEventChanged (object o, PlayerEngineEventArgs args)
{
- if(o != active_engine) {
+ if (o != active_engine) {
return;
}
- if(CurrentTrack != null) {
- if(args.Event == PlayerEngineEvent.Error
+ if (CurrentTrack != null) {
+ if (args.Event == PlayerEngineEvent.Error
&& CurrentTrack.PlaybackError == StreamPlaybackError.None) {
CurrentTrack.PlaybackError = StreamPlaybackError.Unknown;
- } else if(args.Event == PlayerEngineEvent.Iterate
+ } else if (args.Event == PlayerEngineEvent.Iterate
&& CurrentTrack.PlaybackError != StreamPlaybackError.None) {
CurrentTrack.PlaybackError = StreamPlaybackError.None;
}
}
PlayerEngineEventHandler handler = EventChanged;
- if(handler != null) {
+ if (handler != null) {
handler(o, args);
}
@@ -222,18 +217,18 @@
}
}
- public void Open(TrackInfo track)
+ public void Open (TrackInfo track)
{
- if(!track.CanPlay) {
+ if (!track.CanPlay) {
return;
}
- OpenCheck(track);
+ OpenCheck (track);
}
- public void Open(SafeUri uri)
+ public void Open (SafeUri uri)
{
- OpenCheck(uri);
+ OpenCheck (uri);
}
void IPlayerEngineService.Open (string uri)
@@ -241,97 +236,97 @@
OpenCheck (new SafeUri (uri));
}
- public void OpenPlay(TrackInfo track)
+ public void OpenPlay (TrackInfo track)
{
- if(!track.CanPlay) {
+ if (!track.CanPlay) {
return;
}
try {
- OpenCheck(track);
- active_engine.Play();
- } catch(Exception e) {
- Log.Error(Catalog.GetString("Problem with Player Engine"), e.Message);
- Close();
+ OpenCheck (track);
+ active_engine.Play ();
+ } catch (Exception e) {
+ Log.Error (Catalog.GetString ("Problem with Player Engine"), e.Message);
+ Close ();
ActiveEngine = default_engine;
}
}
- private void OpenCheck(object o)
+ private void OpenCheck (object o)
{
SafeUri uri = null;
TrackInfo track = null;
- if(o is SafeUri) {
+ if (o is SafeUri) {
uri = o as SafeUri;
- } else if(o is TrackInfo) {
+ } else if (o is TrackInfo) {
track = o as TrackInfo;
uri = track.Uri;
} else {
return;
}
- FindSupportingEngine(uri);
- CheckPending();
+ FindSupportingEngine (uri);
+ CheckPending ();
- if(track != null) {
- active_engine.Open(track);
- } else if(uri != null) {
- active_engine.Open(uri);
+ if (track != null) {
+ active_engine.Open (track);
+ } else if (uri != null) {
+ active_engine.Open (uri);
}
}
- private void FindSupportingEngine(SafeUri uri)
+ private void FindSupportingEngine (SafeUri uri)
{
- foreach(PlayerEngine engine in engines) {
- foreach(string extension in engine.ExplicitDecoderCapabilities) {
- if(!uri.AbsoluteUri.EndsWith(extension)) {
+ foreach (PlayerEngine engine in engines) {
+ foreach (string extension in engine.ExplicitDecoderCapabilities) {
+ if (!uri.AbsoluteUri.EndsWith (extension)) {
continue;
- } else if(active_engine != engine) {
- Close();
+ } else if (active_engine != engine) {
+ Close ();
pending_engine = engine;
- Console.WriteLine("Switching engine to: " + engine.GetType());
+ Log.DebugFormat ("Switching engine to: {0}", engine.GetType ());
}
return;
}
}
- foreach(PlayerEngine engine in engines) {
- foreach(string scheme in engine.SourceCapabilities) {
+ foreach (PlayerEngine engine in engines) {
+ foreach (string scheme in engine.SourceCapabilities) {
bool supported = scheme == uri.Scheme;
- if(supported && active_engine != engine) {
- Close();
+ if (supported && active_engine != engine) {
+ Close ();
pending_engine = engine;
- Console.WriteLine("Switching engine to: " + engine.GetType());
+ Log.DebugFormat ("Switching engine to: {0}", engine.GetType ());
return;
- } else if(supported) {
+ } else if (supported) {
return;
}
}
}
}
- public void Close()
+ public void Close ()
{
- active_engine.Reset();
- active_engine.Close();
+ active_engine.Reset ();
+ active_engine.Close ();
}
- public void Play()
+ public void Play ()
{
- active_engine.Play();
+ active_engine.Play ();
}
- public void Pause()
+ public void Pause ()
{
- if(!CanPause) {
- Close();
+ if (!CanPause) {
+ Close ();
} else {
- active_engine.Pause();
+ active_engine.Pause ();
}
}
- public void TogglePlaying()
+ public void TogglePlaying ()
{
switch (CurrentState) {
case PlayerEngineState.Idle:
@@ -346,9 +341,9 @@
}
}
- public void TrackInfoUpdated()
+ public void TrackInfoUpdated ()
{
- active_engine.TrackInfoUpdated();
+ active_engine.TrackInfoUpdated ();
}
public bool IsPlaying (TrackInfo track)
@@ -356,11 +351,11 @@
return CurrentState != PlayerEngineState.Idle && track.AudiblyEqual (CurrentTrack);
}
- private void CheckPending()
+ private void CheckPending ()
{
if(pending_engine != null && pending_engine != active_engine) {
if(active_engine.CurrentState == PlayerEngineState.Idle) {
- Close();
+ Close ();
}
active_engine = pending_engine;
@@ -403,7 +398,7 @@
public ushort Volume {
get { return active_engine.Volume; }
set {
- foreach(PlayerEngine engine in engines) {
+ foreach (PlayerEngine engine in engines) {
engine.Volume = value;
}
}
@@ -429,13 +424,13 @@
public uint Length {
get {
uint length = active_engine.Length;
- if(length > 0) {
+ if (length > 0) {
return length;
- } else if(active_engine.CurrentTrack == null) {
+ } else if (active_engine.CurrentTrack == null) {
return 0;
}
- return (uint)active_engine.CurrentTrack.Duration.TotalSeconds;
+ return (uint) active_engine.CurrentTrack.Duration.TotalSeconds;
}
}
@@ -447,14 +442,14 @@
public PlayerEngine DefaultEngine {
get { return default_engine; }
set {
- if(engines.Contains(value)) {
- engines.Remove(value);
+ if (engines.Contains (value)) {
+ engines.Remove (value);
}
- engines.Insert(0, value);
+ engines.Insert (0, value);
default_engine = value;
- EngineSchema.Set(value.Id);
+ EngineSchema.Set (value.Id);
}
}
@@ -470,14 +465,14 @@
get { return null; }
}
- public static readonly SchemaEntry<int> VolumeSchema = new SchemaEntry<int>(
+ public static readonly SchemaEntry<int> VolumeSchema = new SchemaEntry<int> (
"player_engine", "volume",
80,
"Volume",
"Volume of playback relative to mixer output"
);
- public static readonly SchemaEntry<string> EngineSchema = new SchemaEntry<string>(
+ public static readonly SchemaEntry<string> EngineSchema = new SchemaEntry<string> (
"player_engine", "backend",
"helix-remote",
"Backend",
Modified: trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerBandScale.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerBandScale.cs (original)
+++ trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerBandScale.cs Fri Jan 25 01:35:54 2008
@@ -39,40 +39,40 @@
public event EventHandler ValueChanged;
- public EqualizerBandScale(uint band, int median, int min, int max, string labelText)
+ public EqualizerBandScale (uint band, int median, int min, int max, string labelText)
{
this.band = band;
- label = new Label();
- label.Markup = String.Format("<small>{0}</small>", GLib.Markup.EscapeText(labelText));
+ label = new Label ();
+ label.Markup = String.Format ("<small>{0}</small>", GLib.Markup.EscapeText (labelText));
label.Xalign = 0.0f;
label.Yalign = 1.0f;
label.Angle = 90.0;
- // new Adjustment(value, lower, upper, step_incr, page_incr, page_size);
- scale = new VScale(new Adjustment(median, min, max, max / 10, max / 10, 1));
+ // new Adjustment (value, lower, upper, step_incr, page_incr, page_size);
+ scale = new VScale (new Adjustment (median, min, max, max / 10, max / 10, 1));
scale.DrawValue = false;
scale.Inverted = true;
scale.ValueChanged += OnValueChanged;
- scale.Show();
- label.Show();
+ scale.Show ();
+ label.Show ();
- PackStart(scale, false, false, 0);
- PackStart(label, false, false, 0);
+ PackStart (scale, false, false, 0);
+ PackStart (label, false, false, 0);
}
- private void OnValueChanged(object o, EventArgs args)
+ private void OnValueChanged (object o, EventArgs args)
{
EventHandler handler = ValueChanged;
if(handler != null) {
- handler(this, new EventArgs());
+ handler(this, new EventArgs ());
}
}
public int Value {
- get { return (int)scale.Value; }
- set { scale.Value = (double)value; }
+ get { return (int) scale.Value; }
+ set { scale.Value = (double) value; }
}
public bool LabelVisible {
Modified: trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerLevelsBox.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerLevelsBox.cs (original)
+++ trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerLevelsBox.cs Fri Jan 25 01:35:54 2008
@@ -35,11 +35,11 @@
{
public class EqualizerLevelsBox : VBox
{
- public EqualizerLevelsBox(params string [] levels)
+ public EqualizerLevelsBox (params string [] levels)
{
- for(int i = 0; i < levels.Length && i < 3; i++) {
- Label label = CreateLabel(levels[i]);
- switch(i) {
+ for (int i = 0; i < levels.Length && i < 3; i++) {
+ Label label = CreateLabel (levels[i]);
+ switch (i) {
case 0:
label.Yalign = 0.05f;
break;
@@ -52,18 +52,18 @@
break;
}
- PackStart(label, true, true, 0);
+ PackStart (label, true, true, 0);
}
}
- private Label CreateLabel(string value)
+ private Label CreateLabel (string value)
{
- Label label = new Label();
+ Label label = new Label ();
label.Xalign = 1.0f;
- label.Markup = String.Format("<small>{0}</small>", GLib.Markup.EscapeText(value));
- label.ModifyFg(StateType.Normal, DrawingUtilities.ColorBlend(
- Style.Foreground(StateType.Normal), Style.Background(StateType.Normal), 0.5));
- label.Show();
+ label.Markup = String.Format ("<small>{0}</small>", GLib.Markup.EscapeText (value));
+ label.ModifyFg (StateType.Normal, DrawingUtilities.ColorBlend (
+ Style.Foreground (StateType.Normal), Style.Background (StateType.Normal), 0.5));
+ label.Show ();
return label;
}
}
Modified: trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerPresetComboBox.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerPresetComboBox.cs (original)
+++ trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerPresetComboBox.cs Fri Jan 25 01:35:54 2008
@@ -37,73 +37,70 @@
private ListStore store;
private EqualizerSetting active_eq;
- public EqualizerPresetComboBox() : this(EqualizerManager.Instance)
+ public EqualizerPresetComboBox () : this (EqualizerManager.Instance)
{
}
- public EqualizerPresetComboBox(EqualizerManager manager) : base()
+ public EqualizerPresetComboBox (EqualizerManager manager) : base ()
{
- if(manager == null) {
- throw new ArgumentNullException("provide an EqualizerManager or use default constructor");
+ if (manager == null) {
+ throw new ArgumentNullException ("provide an EqualizerManager or use default constructor");
}
this.manager = manager;
- BuildWidget();
+ BuildWidget ();
}
- private void BuildWidget()
+ private void BuildWidget ()
{
- store = new ListStore(typeof(string), typeof(EqualizerSetting));
+ store = new ListStore (typeof (string), typeof (EqualizerSetting));
Model = store;
TextColumn = 0;
- foreach(EqualizerSetting eq in manager) {
+ foreach (EqualizerSetting eq in manager) {
AddEqualizerSetting(eq);
}
- manager.EqualizerAdded += delegate(object o, EqualizerSettingEventArgs args) {
- AddEqualizerSetting(args.EqualizerSetting);
+ manager.EqualizerAdded += delegate (object o, EqualizerSettingEventArgs args) {
+ AddEqualizerSetting (args.EqualizerSetting);
};
- manager.EqualizerRemoved += delegate(object o, EqualizerSettingEventArgs args) {
- RemoveEqualizerSetting(args.EqualizerSetting);
+ manager.EqualizerRemoved += delegate (object o, EqualizerSettingEventArgs args) {
+ RemoveEqualizerSetting (args.EqualizerSetting);
};
}
- protected override void OnChanged()
+ protected override void OnChanged ()
{
EqualizerSetting eq = ActiveEqualizer;
- if(eq != null) {
+ if (eq != null) {
active_eq = eq;
- } else if(eq == null && active_eq == null) {
- base.OnChanged();
+ } else if (eq == null && active_eq == null) {
+ base.OnChanged ();
return;
- } else if(eq == null) {
+ } else if (eq == null) {
eq = active_eq;
}
eq.Name = Entry.Text;
TreeIter iter;
- if(GetIterForEqualizerSetting(eq, out iter)) {
- store.SetValue(iter, 0, eq.Name);
+ if (GetIterForEqualizerSetting (eq, out iter)) {
+ store.SetValue (iter, 0, eq.Name);
}
- if(eq != ActiveEqualizer) {
+ if (eq != ActiveEqualizer) {
ActiveEqualizer = eq;
- base.OnChanged();
+ base.OnChanged ();
}
}
- public bool ActivatePreferredEqualizer(string name)
+ public bool ActivatePreferredEqualizer (string name)
{
- if (name == null || name == "")
- {
- return ActivateFirstEqualizer();
- }
- else
- {
- foreach(EqualizerSetting eq in manager) {
+ if (name == null || name == "") {
+ return ActivateFirstEqualizer ();
+ } else {
+ foreach (EqualizerSetting eq in manager) {
if (eq.Name == name) {
ActiveEqualizer = eq;
return true;
@@ -114,45 +111,45 @@
}
}
- public bool ActivateFirstEqualizer()
+ public bool ActivateFirstEqualizer ()
{
TreeIter iter;
- if(store.IterNthChild(out iter, 0)) {
- ActiveEqualizer = GetEqualizerSettingForIter(iter);
+ if (store.IterNthChild (out iter, 0)) {
+ ActiveEqualizer = GetEqualizerSettingForIter (iter);
return true;
}
return false;
}
- private void AddEqualizerSetting(EqualizerSetting eq)
+ private void AddEqualizerSetting (EqualizerSetting eq)
{
- store.AppendValues(eq.Name, eq);
+ store.AppendValues (eq.Name, eq);
}
- private void RemoveEqualizerSetting(EqualizerSetting eq)
+ private void RemoveEqualizerSetting (EqualizerSetting eq)
{
TreeIter iter;
- if(GetIterForEqualizerSetting(eq, out iter)) {
- store.Remove(ref iter);
+ if (GetIterForEqualizerSetting (eq, out iter)) {
+ store.Remove (ref iter);
}
- if(!ActivateFirstEqualizer()) {
+ if (!ActivateFirstEqualizer ()) {
active_eq = null;
Entry.Text = String.Empty;
}
}
- private EqualizerSetting GetEqualizerSettingForIter(TreeIter iter)
+ private EqualizerSetting GetEqualizerSettingForIter (TreeIter iter)
{
- return store.GetValue(iter, 1) as EqualizerSetting;
+ return store.GetValue (iter, 1) as EqualizerSetting;
}
- private bool GetIterForEqualizerSetting(EqualizerSetting eq, out TreeIter iter)
+ private bool GetIterForEqualizerSetting (EqualizerSetting eq, out TreeIter iter)
{
- for(int i = 0, n = store.IterNChildren(); i < n; i++) {
- if(store.IterNthChild(out iter, i) && store.GetValue(iter, 1) == eq) {
+ for (int i = 0, n = store.IterNChildren (); i < n; i++) {
+ if (store.IterNthChild (out iter, i) && store.GetValue (iter, 1) == eq) {
return true;
}
}
@@ -164,15 +161,15 @@
public EqualizerSetting ActiveEqualizer {
get {
TreeIter iter;
- return GetActiveIter(out iter) ? GetEqualizerSettingForIter(iter) : null;
+ return GetActiveIter (out iter) ? GetEqualizerSettingForIter (iter) : null;
}
set {
active_eq = value;
TreeIter iter;
- if(GetIterForEqualizerSetting(value, out iter)) {
- SetActiveIter(iter);
+ if (GetIterForEqualizerSetting (value, out iter)) {
+ SetActiveIter (iter);
}
}
}
Modified: trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerView.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerView.cs (original)
+++ trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerView.cs Fri Jan 25 01:35:54 2008
@@ -51,60 +51,64 @@
public event EqualizerChangedEventHandler EqualizerChanged;
public event AmplifierChangedEventHandler AmplifierChanged;
- public EqualizerView() : base()
+ public EqualizerView () : base ()
{
- BuildWidget();
+ BuildWidget ();
}
- private void BuildWidget()
+ private void BuildWidget ()
{
Spacing = 10;
// amplifier_scale's values must be divisible by 100 to get *real* val. eg 100 == 1, 40 == 0.4, 1 == 0.01
- amplifier_scale = new EqualizerBandScale(0, 100, 5, 150, "Preamp");
+ amplifier_scale = new EqualizerBandScale (0, 100, 5, 150, "Preamp");
amplifier_scale.ValueChanged += OnAmplifierValueChanged;
- amplifier_scale.Show();
- PackStart(amplifier_scale, false, false, 0);
+ amplifier_scale.Show ();
+ PackStart (amplifier_scale, false, false, 0);
- int[] br = ((IEqualizer)ServiceManager.PlayerEngine.ActiveEngine).BandRange;
+ int[] br = ((IEqualizer) ServiceManager.PlayerEngine.ActiveEngine).BandRange;
int mid = (br[0] + br[1]) / 2;
range[0] = br[0];
range[1] = mid;
range[2] = br[1];
- EqualizerLevelsBox eq_levels = new EqualizerLevelsBox(
- FormatDecibelString(range[2]),
- FormatDecibelString(range[1]),
- FormatDecibelString(range[0])
+ EqualizerLevelsBox eq_levels = new EqualizerLevelsBox (
+ FormatDecibelString (range[2]),
+ FormatDecibelString (range[1]),
+ FormatDecibelString (range[0])
);
- eq_levels.Show();
- PackStart(eq_levels, false, false, 0);
+ eq_levels.Show ();
+ PackStart (eq_levels, false, false, 0);
- band_box = new HBox();
+ band_box = new HBox ();
band_box.Homogeneous = true;
- band_box.Show();
- PackStart(band_box, true, true, 0);
+ band_box.Show ();
+ PackStart (band_box, true, true, 0);
- BuildBands();
+ BuildBands ();
}
/// <summary>
/// Utility function to create a dB string for the levels box.
/// </summary>
- private string FormatDecibelString(int db)
+ private string FormatDecibelString (int db)
{
- if (db > 0) { return String.Format("+{0} dB", db); } else { return String.Format("{0} dB", db); }
+ if (db > 0) {
+ return String.Format("+{0} dB", db);
+ } else {
+ return String.Format("{0} dB", db);
+ }
}
- private void BuildBands()
+ private void BuildBands ()
{
- foreach(Widget widget in band_box.Children) {
- band_box.Remove(widget);
+ foreach (Widget widget in band_box.Children) {
+ band_box.Remove (widget);
}
- if(frequencies == null || frequencies.Length <= 0) {
+ if (frequencies == null || frequencies.Length <= 0) {
frequencies = new uint[0];
band_scales = new EqualizerBandScale[0];
return;
@@ -112,66 +116,65 @@
band_scales = new EqualizerBandScale[10];
- for(uint i = 0; i < 10; i++) {
+ for (uint i = 0; i < 10; i++) {
string label = frequencies[i] < 1000 ?
String.Format("{0} Hz", frequencies[i]) :
String.Format("{0} kHz", frequencies[i] / 1000);
-
- //band_scales[i] = new EqualizerBandScale(bands[i], label);
+
band_scales[i] = new EqualizerBandScale(i, range[1] * 10, range[0] * 10, range[2] * 10, label);
band_scales[i].ValueChanged += OnEqualizerValueChanged;
- band_scales[i].Show();
+ band_scales[i].Show ();
- band_box.PackStart(band_scales[i], true, true, 0);
+ band_box.PackStart (band_scales[i], true, true, 0);
}
}
- private void OnEqualizerValueChanged(object o, EventArgs args)
+ private void OnEqualizerValueChanged (object o, EventArgs args)
{
EqualizerBandScale scale = o as EqualizerBandScale;
- if(active_eq != null) {
- active_eq.SetGain(scale.Band, (double)scale.Value / 10D);
+ if (active_eq != null) {
+ active_eq.SetGain (scale.Band, (double)scale.Value / 10D);
}
- if(EqualizerChanged != null) {
- EqualizerChanged(this, new EqualizerChangedEventArgs(scale.Band, scale.Value));
+ if (EqualizerChanged != null) {
+ EqualizerChanged (this, new EqualizerChangedEventArgs (scale.Band, scale.Value));
}
}
- private void OnAmplifierValueChanged(object o, EventArgs args)
+ private void OnAmplifierValueChanged (object o, EventArgs args)
{
EqualizerBandScale scale = o as EqualizerBandScale;
- if(active_eq != null) {
- double val = (double)scale.Value / 100D;
+ if (active_eq != null) {
+ double val = (double) scale.Value / 100D;
active_eq.AmplifierLevel = val;
}
- if(AmplifierChanged != null) {
- AmplifierChanged(this, new AmplifierChangedEventArgs(scale.Value));
+ if (AmplifierChanged != null) {
+ AmplifierChanged (this, new AmplifierChangedEventArgs (scale.Value));
}
}
public uint [] Frequencies {
- get { return (uint [])frequencies.Clone(); }
+ get { return (uint [])frequencies.Clone (); }
set {
- frequencies = (uint [])value.Clone();
- BuildBands();
+ frequencies = (uint []) value.Clone ();
+ BuildBands ();
}
}
public int [] Preset {
get {
int [] result = new int[band_scales.Length];
- for(int i = 0; i < band_scales.Length; i++) {
- result[i] = (int)band_scales[i].Value;
+ for (int i = 0; i < band_scales.Length; i++) {
+ result[i] = (int) band_scales[i].Value;
}
return result;
}
set {
- for(int i = 0; i < value.Length; i++) {
+ for (int i = 0; i < value.Length; i++) {
band_scales[i].Value = value[i];
}
}
@@ -179,12 +182,12 @@
public void SetBand(uint band, double value)
{
- band_scales[band].Value = (int)(value * 10);
+ band_scales[band].Value = (int) (value * 10);
}
public double AmplifierLevel {
- get { return (double)amplifier_scale.Value / 100D; }
- set { amplifier_scale.Value = (int)(value * 100); }
+ get { return (double) amplifier_scale.Value / 100D; }
+ set { amplifier_scale.Value = (int) (value * 100); }
}
public EqualizerSetting EqualizerSetting {
@@ -192,31 +195,30 @@
set {
active_eq = value;
- if(active_eq == null) {
+ if (active_eq == null) {
AmplifierLevel = 0;
-
return;
}
AmplifierLevel = active_eq.AmplifierLevel;
- for(int i = 0; i < active_eq.BandCount; i++) {
- uint x = (uint)i;
- SetBand(x, active_eq[x]);
+ for (int i = 0; i < active_eq.BandCount; i++) {
+ uint x = (uint) i;
+ SetBand (x, active_eq[x]);
}
}
}
}
- public delegate void EqualizerChangedEventHandler(object o, EqualizerChangedEventArgs args);
- public delegate void AmplifierChangedEventHandler(object o, AmplifierChangedEventArgs args);
+ public delegate void EqualizerChangedEventHandler (object o, EqualizerChangedEventArgs args);
+ public delegate void AmplifierChangedEventHandler (object o, AmplifierChangedEventArgs args);
public sealed class EqualizerChangedEventArgs : EventArgs
{
private uint band;
private int value;
- public EqualizerChangedEventArgs(uint band, int value)
+ public EqualizerChangedEventArgs (uint band, int value)
{
this.band = band;
this.value = value;
@@ -235,7 +237,7 @@
{
private int value;
- public AmplifierChangedEventArgs(int value)
+ public AmplifierChangedEventArgs (int value)
{
this.value = value;
}
Modified: trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerWindow.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerWindow.cs (original)
+++ trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerWindow.cs Fri Jan 25 01:35:54 2008
@@ -48,78 +48,75 @@
private EqualizerPresetComboBox eq_preset_combo;
[Widget] private CheckButton eq_enabled_checkbox;
- public EqualizerWindow() : base("EqualizerWindow")
+ public EqualizerWindow () : base ("EqualizerWindow")
{
- eq_view = new EqualizerView();
+ eq_view = new EqualizerView ();
eq_view.BorderWidth = 10;
- eq_view.SetSizeRequest(-1, 110);
- eq_view.Frequencies = ((IEqualizer)ServiceManager.PlayerEngine.ActiveEngine).EqualizerFrequencies;
- eq_view.Show();
+ eq_view.SetSizeRequest (-1, 110);
+ eq_view.Frequencies = ((IEqualizer) ServiceManager.PlayerEngine.ActiveEngine).EqualizerFrequencies;
+ eq_view.Show ();
eq_enabled_checkbox = (Glade["eq_enabled_checkbox"] as CheckButton);
- eq_preset_combo = new EqualizerPresetComboBox();
+ eq_preset_combo = new EqualizerPresetComboBox ();
eq_preset_combo.Changed += OnPresetChanged;
- eq_preset_combo.Show();
+ eq_preset_combo.Show ();
Window.Realized += delegate {
Widget header = Glade["eq_header_evbox"];
- header.ModifyBg(StateType.Normal, header.Style.Background(StateType.Active));
- Window.Show();
+ header.ModifyBg (StateType.Normal, header.Style.Background (StateType.Active));
+ Window.Show ();
};
- (Glade["eq_view_box"] as Box).PackStart(eq_view, true, true, 0);
- (Glade["eq_preset_box"] as Box).PackStart(eq_preset_combo, true, false, 0);
+ (Glade["eq_view_box"] as Box).PackStart (eq_view, true, true, 0);
+ (Glade["eq_preset_box"] as Box).PackStart (eq_preset_combo, true, false, 0);
(Glade["new_preset_button"] as Button).Clicked += OnNewPreset;
(Glade["delete_preset_button"] as Button).Clicked += OnDeletePreset;
- eq_enabled_checkbox.Active = EqualizerSetting.EnabledSchema.Get();
- eq_preset_combo.ActivatePreferredEqualizer(EqualizerSetting.PresetSchema.Get());
+ eq_enabled_checkbox.Active = EqualizerSetting.EnabledSchema.Get ();
+ eq_preset_combo.ActivatePreferredEqualizer (EqualizerSetting.PresetSchema.Get ());
- if(eq_enabled_checkbox.Active)
- {
+ if(eq_enabled_checkbox.Active) {
// enable equalizer if was enabled last session
- EqualizerManager.Instance.Enable(eq_preset_combo.ActiveEqualizer);
+ EqualizerManager.Instance.Enable (eq_preset_combo.ActiveEqualizer);
}
- if (eq_preset_combo.ActiveEqualizer == null)
- {
+ if (eq_preset_combo.ActiveEqualizer == null) {
// user has no presets, so create one
- OnNewPreset(null, null);
+ OnNewPreset (null, null);
// enable our new preset (it has no effect though, since all bands are 0db)
eq_enabled_checkbox.Active = true;
- OnEnableDisable(null, null); // notify engine and save it for next session
+ OnEnableDisable (null, null); // notify engine and save it for next session
}
eq_enabled_checkbox.Clicked += OnEnableDisable;
- Window.Show();
+ Window.Show ();
}
- private void OnNewPreset(object o, EventArgs args)
+ private void OnNewPreset (object o, EventArgs args)
{
- EqualizerSetting eq = new EqualizerSetting("New Preset");
- EqualizerManager.Instance.Add(eq);
+ EqualizerSetting eq = new EqualizerSetting ("New Preset");
+ EqualizerManager.Instance.Add (eq);
eq_preset_combo.ActiveEqualizer = eq;
- eq_preset_combo.Entry.SelectRegion(0, eq_preset_combo.Entry.Text.Length);
+ eq_preset_combo.Entry.SelectRegion (0, eq_preset_combo.Entry.Text.Length);
}
- private void OnDeletePreset(object o, EventArgs args)
+ private void OnDeletePreset (object o, EventArgs args)
{
- EqualizerManager.Instance.Remove(eq_preset_combo.ActiveEqualizer);
+ EqualizerManager.Instance.Remove (eq_preset_combo.ActiveEqualizer);
}
- private void OnPresetChanged(object o, EventArgs args)
+ private void OnPresetChanged (object o, EventArgs args)
{
if(eq_preset_combo.ActiveEqualizer != eq_view.EqualizerSetting) {
eq_view.EqualizerSetting = eq_preset_combo.ActiveEqualizer;
-
- OnEnableDisable(null, null);
+ OnEnableDisable (null, null);
}
}
- private void OnEnableDisable(object o, EventArgs args)
+ private void OnEnableDisable (object o, EventArgs args)
{
if (eq_enabled_checkbox.Active) {
EqualizerManager.Instance.Enable(eq_preset_combo.ActiveEqualizer);
Modified: trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui/ViewActions.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui/ViewActions.cs (original)
+++ trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui/ViewActions.cs Fri Jan 25 01:35:54 2008
@@ -68,15 +68,14 @@
private void OnPlayerEngineStateChanged (object o, PlayerEngineStateArgs args)
{
- if (args.State == PlayerEngineState.Initalized && !ServiceManager.PlayerEngine.SupportsEqualizer)
- {
+ if (args.State == PlayerEngineState.Initalized && !ServiceManager.PlayerEngine.SupportsEqualizer) {
action_service["View.ShowEqualizerAction"].Sensitive = false;
}
}
private void OnShowEqualizer (object o, EventArgs args)
{
- EqualizerWindow eqwin = new EqualizerWindow();
+ EqualizerWindow eqwin = new EqualizerWindow ();
}
}
}
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 Fri Jan 25 01:35:54 2008
@@ -3705,7 +3705,7 @@
<property name="decorated">True</property>
<property name="skip_taskbar_hint">True</property>
<property name="skip_pager_hint">True</property>
- <property name="type_hint">GDK_WINDOW_TYPE_HINT_UTILITY</property>
+ <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
<property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
<property name="focus_on_map">True</property>
<property name="urgency_hint">False</property>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
