Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Change contract IDs to agreed format
  • Loading branch information
freaktechnik committed Jun 7, 2014
1 parent cbad1be commit 76b8a5d
Show file tree
Hide file tree
Showing 9 changed files with 12 additions and 12 deletions.
4 changes: 2 additions & 2 deletions app/content/bindings/eqPresetList.xml
Expand Up @@ -113,9 +113,9 @@
.getService(Ci.nsIPrefBranch2);
this._prefs.addObserver("songbird.eq.currentPreset", this._observer, false);
this._pm = Cc["@getnightingale.com/Nightingale/equalizer-presets/manager;1"]
this._pm = Cc["@getnightingale.com/equalizer-presets/manager;1"]
.getService(Ci.ngIEqualizerPresetProviderManager);
this._mp = Cc["@getnightingale.com/Nightingale/equalizer-presets/main-provider;1"]
this._mp = Cc["@getnightingale.com/equalizer-presets/main-provider;1"]
.getService(Ci.ngIMainEqualizerPresetProvider);
// initialize the prefs list
Expand Down
4 changes: 2 additions & 2 deletions components/equalizerpresets/src/ngDefaultPresetProvider.js
Expand Up @@ -63,14 +63,14 @@ function ngDefaultPresetProvider() {
ngDefaultPresetProvider.prototype = {
classDescription: "Preset provider that provides the default equalizer presets",
classID: Components.ID("{1f3b39da-c169-49df-af70-eaec9c10640a}"),
contractID: "@getnightingale.com/Nightingale/equalizer-presets/defaults;1",
contractID: "@getnightingale.com/equalizer-presets/defaults;1",
QueryInterface: XPCOMUtils.generateQI([Ci.ngIEqualizerPresetProvider]),

_presets: null,

_createPreset: function(property, strBundle, values) {
LOG("_createPreset("+property+", "+strBundle+", "+values+")");
var preset = Cc["@getnightingale.com/Nightingale/equalizer-presets/localizable;1"]
var preset = Cc["@getnightingale.com/equalizer-presets/localizable;1"]
.createInstance(Ci.ngILocalizableEqualizerPreset);
preset.stringBundle = strBundle;
preset.property = property;
Expand Down
Expand Up @@ -33,7 +33,7 @@ function ngLocalizableEqualizerPreset() {
ngLocalizableEqualizerPreset.prototype = {
classDescription: "Basic mutable equalizer preset with localizable name",
classID: Components.ID("{1c4b8b2c-a2c1-4652-9fb3-523face810b9}"),
contractID: "@getnightingale.com/Nightingale/equalizer-presets/localizable;1",
contractID: "@getnightingale.com/equalizer-presets/localizable;1",
QueryInterface: XPCOMUtils.generateQI([Components.interfaces.ngILocalizableEqualizerPreset]),

_gMM: null,
Expand Down
Expand Up @@ -34,7 +34,7 @@ function ngMutableEqualizerPreset() {
ngMutableEqualizerPreset.prototype = {
classDescription: "Basic mutable equalizer preset",
classID: Components.ID("{f87e3ba3-c3fe-437a-8b2f-3aeb48536a9b}"),
contractID: "@getnightingale.com/Nightingale/equalizer-presets/mutable;1",
contractID: "@getnightingale.com/equalizer-presets/mutable;1",
QueryInterface: XPCOMUtils.generateQI([Components.interfaces.ngIMutableEqualizerPreset]),

_gMM: null,
Expand Down
Expand Up @@ -34,7 +34,7 @@ if(!Cr)
this.Cr = Components.results;

function runTest() {
var localizablePreset = Cc["@getnightingale.com/Nightingale/equalizer-presets/localizable;1"]
var localizablePreset = Cc["@getnightingale.com/equalizer-presets/localizable;1"]
.createInstance(Ci.ngILocalizableEqualizerPreset);

assertEqual(localizablePreset.values, null, "Values are already defined");
Expand Down
Expand Up @@ -32,7 +32,7 @@ if (typeof(Ci) == "undefined")
this.Ci = Components.interfaces;

function runTest() {
var mainProvider = Cc["@getnightingale.com/Nightingale/equalizer-presets/main-provider;1"]
var mainProvider = Cc["@getnightingale.com/equalizer-presets/main-provider;1"]
.getService(Ci.ngIMainEqualizerPresetProvider);

assertTrue(mainProvider.presets instanceof Ci.nsIArray, "Presets aren't an nsIArray");
Expand Down
Expand Up @@ -32,7 +32,7 @@ if (typeof(Ci) == "undefined")
this.Ci = Components.interfaces;

function runTest() {
var mutablePreset = Cc["@getnightingale.com/Nightingale/equalizer-presets/mutable;1"]
var mutablePreset = Cc["@getnightingale.com/equalizer-presets/mutable;1"]
.createInstance(Ci.ngIMutableEqualizerPreset);
assertEqual(mutablePreset.name, null, "Name is already defined");
assertEqual(mutablePreset.values, null, "Values are already defined");
Expand All @@ -45,4 +45,4 @@ function runTest() {
assertEqual(mutablePreset.values.length, 10, "Not all values were written into the array");

return;
}
}
Expand Up @@ -32,7 +32,7 @@ if (typeof(Ci) == "undefined")
this.Ci = Components.interfaces;

function runTest() {
var providerManager = Cc["@getnightingale.com/Nightingale/equalizer-presets/manager;1"]
var providerManager = Cc["@getnightingale.com/equalizer-presets/manager;1"]
.getService(Ci.ngIEqualizerPresetProviderManager);

assertTrue(providerManager.providers.length >= 2, "Not all providers were registered");
Expand Down
Expand Up @@ -195,7 +195,7 @@ sbBaseMediacoreMultibandEqualizer::InitBaseMediacoreMultibandEqualizer()
rv = data->GetData(mCurrentPresetName);
NS_ENSURE_SUCCESS(rv, rv);

mPresets = do_ProxiedGetService("@getnightingale.com/Nightingale/equalizer-presets/manager;1", &rv);
mPresets = do_ProxiedGetService("@getnightingale.com/equalizer-presets/manager;1", &rv);
NS_ENSURE_SUCCESS(rv, rv);

return rv;
Expand Down

0 comments on commit 76b8a5d

Please sign in to comment.