Bug 1075091 - Rename Firefly code to Matchstick. r=wesj
authorRichard Newman <rnewman@mozilla.com>
Wed, 01 Oct 2014 10:21:37 -0700
changeset 208181 e8b947548ce64607f1dbfc952a4c9d61d619485e
parent 208180 81f24d931d8926cf2aab90499c66958c60558962
child 208182 611fa34ae0863337fae33b00ad4b83949b288fb9
push id27579
push userkwierso@gmail.com
push dateWed, 01 Oct 2014 23:02:13 +0000
treeherderautoland@f771fd927304 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerswesj
bugs1075091
milestone35.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1075091 - Rename Firefly code to Matchstick. r=wesj
mobile/android/base/MediaPlayerManager.java
mobile/android/chrome/content/CastingApps.js
mobile/android/modules/FireflyApp.jsm
mobile/android/modules/MatchstickApp.jsm
mobile/android/modules/moz.build
--- a/mobile/android/base/MediaPlayerManager.java
+++ b/mobile/android/base/MediaPlayerManager.java
@@ -122,17 +122,17 @@ class MediaPlayerManager implements Nati
                     JSONObject json = disp.toJSON();
                     if (json == null) {
                         items.remove();
                     } else {
                         disps.put(json);
                     }
                 } catch(Exception ex) {
                     // This may happen if the device isn't a real Chromecast,
-                    // for example Firefly casting devices.
+                    // for example Matchstick casting devices.
                     Log.e(LOGTAG, "Couldn't create JSON for display", ex);
                 }
             }
 
             try {
                 result.put("displays", disps);
             } catch(JSONException ex) {
                 Log.i(LOGTAG, "Error sending displays", ex);
--- a/mobile/android/chrome/content/CastingApps.js
+++ b/mobile/android/chrome/content/CastingApps.js
@@ -16,26 +16,26 @@ var rokuDevice = {
     Cu.import("resource://gre/modules/RokuApp.jsm");
     return new RokuApp(aService);
   },
   mirror: Services.prefs.getBoolPref("browser.mirroring.enabled.roku"),
   types: ["video/mp4"],
   extensions: ["mp4"]
 };
 
-var fireflyDevice = {
-  id: "firefly:dial",
+var matchstickDevice = {
+  id: "matchstick:dial",
   target: "urn:dial-multiscreen-org:service:dial:1",
   filters: {
     server: null,
     modelName: "Eureka Dongle"
   },
   factory: function(aService) {
-    Cu.import("resource://gre/modules/FireflyApp.jsm");
-    return new FireflyApp(aService);
+    Cu.import("resource://gre/modules/MatchstickApp.jsm");
+    return new MatchstickApp(aService);
   },
   types: ["video/mp4", "video/webm"],
   extensions: ["mp4", "webm"]
 };
 
 var mediaPlayerDevice = {
   id: "media:router",
   target: "media:router",
@@ -54,17 +54,17 @@ var CastingApps = {
 
   init: function ca_init() {
     if (!this.isCastingEnabled()) {
       return;
     }
 
     // Register targets
     SimpleServiceDiscovery.registerDevice(rokuDevice);
-    SimpleServiceDiscovery.registerDevice(fireflyDevice);
+    SimpleServiceDiscovery.registerDevice(matchstickDevice);
     SimpleServiceDiscovery.registerDevice(mediaPlayerDevice);
 
     // Search for devices continuously every 120 seconds
     SimpleServiceDiscovery.search(120 * 1000);
 
     this._castMenuId = NativeWindow.contextmenus.add(
       Strings.browser.GetStringFromName("contextmenu.sendToDevice"),
       this.filterCast,
rename from mobile/android/modules/FireflyApp.jsm
rename to mobile/android/modules/MatchstickApp.jsm
--- a/mobile/android/modules/FireflyApp.jsm
+++ b/mobile/android/modules/MatchstickApp.jsm
@@ -1,16 +1,16 @@
 /* -*- js-indent-level: 2; indent-tabs-mode: nil -*- */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 "use strict";
 
-this.EXPORTED_SYMBOLS = ["FireflyApp"];
+this.EXPORTED_SYMBOLS = ["MatchstickApp"];
 
 const { classes: Cc, interfaces: Ci, utils: Cu } = Components;
 
 Cu.import("resource://gre/modules/Services.jsm");
 
 // meta constants
 const HEADER_META = ".meta";
 const PROTO_CMD_KEY = "cmd";
@@ -101,22 +101,22 @@ const RAMP_CAST_STATUS_TITLE = "title";
 const RAMP_CAST_STATUS_VOLUME = "volume";
 const PLAYER_STATUS_PREPARING = 1;
 const PLAYER_STATUS_PLAYING = 2;
 const PLAYER_STATUS_PAUSE = 3;
 const PLAYER_STATUS_STOP = 4;
 const PLAYER_STATUS_IDLE = 5;
 const PLAYER_STATUS_BUFFERING = 6;
 
-function FireflyApp(service) {
+function MatchstickApp(service) {
   let uri = Services.io.newURI(service.location, null, null);
   this._ip = uri.host;
 };
 
-FireflyApp.prototype = {
+MatchstickApp.prototype = {
   _ip: null,
   _port: 8888,
   _cmd_socket: null,
   _meta_callback: null,
   _ramp_callbacks: {},
   _mediaListener: null,
   _event_sequence: 0,
   status: "unloaded",
--- a/mobile/android/modules/moz.build
+++ b/mobile/android/modules/moz.build
@@ -4,22 +4,22 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 EXTRA_JS_MODULES += [
     'Accounts.jsm',
     'AndroidLog.jsm',
     'ContactService.jsm',
     'dbg-browser-actors.js',
-    'FireflyApp.jsm',
     'HelperApps.jsm',
     'Home.jsm',
     'HomeProvider.jsm',
     'JNI.jsm',
     'LightweightThemeConsumer.jsm',
+    'MatchstickApp.jsm',
     'MediaPlayerApp.jsm',
     'Messaging.jsm',
     'NetErrorHelper.jsm',
     'Notifications.jsm',
     'OrderedBroadcast.jsm',
     'PageActions.jsm',
     'Prompt.jsm',
     'Sanitizer.jsm',