Handle handling of duplicate "add" events that were appearing in some platforms, fix some spacing

redgecombe · redgecombe · commit 9976ae8fe26b · 2015-06-03T15:29:35.000-07:00
diff --git a/nw.gypi b/nw.gypi
@@ -207,7 +207,7 @@
         'src/api/event/event.cc',
         'src/api/screen/desktop_capture_api.h',
         'src/api/screen/desktop_capture_api.cc',
-		'src/api/screen/desktop_capture_monitor.cc',
+        'src/api/screen/desktop_capture_monitor.cc',
         'src/api/screen/desktop_capture_monitor.h',
         '<(DEPTH)/chrome/browser/media/desktop_media_list.h',
         '<(DEPTH)/chrome/browser/media/desktop_media_list_observer.h',
diff --git a/src/api/screen/desktop_capture_monitor.cc b/src/api/screen/desktop_capture_monitor.cc
@@ -98,28 +98,28 @@ void DesktopCaptureMonitor::OnSourceAdded(int index){
 	param.AppendString(src.id.ToString());
 	param.AppendString(src.name);
 	param.AppendInteger(index);
-	param.AppendString(type);
+	param.AppendString(type);
 	this->dispatcher_host()->SendEvent(this, "__nw_desktop_capture_monitor_listner_added", param);
 }
 void DesktopCaptureMonitor::OnSourceRemoved(int index){
 	base::ListValue param;
-	param.AppendInteger(index); //pass by index here, because the information about which ID was at that index is lost before the removed callback is called.  Its saved in the javascript though, so we can look it up there
+	param.AppendInteger(index); //pass by index here, because the information about which ID was at that index is lost before the removed callback is called.  Its saved in the javascript though, so we can look it up there
 	this->dispatcher_host()->SendEvent(this, "__nw_desktop_capture_monitor_listner_removed", param);
 }
 void DesktopCaptureMonitor::OnSourceMoved(int old_index, int new_index){
 	DesktopMediaList::Source src = media_list_->GetSource(new_index);
 	base::ListValue param;
 	param.AppendString(src.id.ToString());
 	param.AppendInteger(new_index);
-	param.AppendInteger(old_index);
+	param.AppendInteger(old_index);
 	this->dispatcher_host()->SendEvent(this, "__nw_desktop_capture_monitor_listner_moved", param);
 }
 void DesktopCaptureMonitor::OnSourceNameChanged(int index){
 	DesktopMediaList::Source src = media_list_->GetSource(index);
 
 	base::ListValue param;
 	param.AppendString(src.id.ToString());
-	param.AppendString(src.name);
+	param.AppendString(src.name);
 	this->dispatcher_host()->SendEvent(this, "__nw_desktop_capture_monitor_listner_namechanged", param);
 }
 
diff --git a/src/api/screen/desktop_capture_monitor.h b/src/api/screen/desktop_capture_monitor.h
@@ -30,7 +30,7 @@ namespace nwapi {
 			DesktopCaptureMonitor(int id,
 				const base::WeakPtr<DispatcherHost>& dispatcher_host,
 				const base::DictionaryValue& option);
-			virtual ~DesktopCaptureMonitor();
+			virtual ~DesktopCaptureMonitor() override;
 			virtual void CallSync(const std::string& method, const base::ListValue& arguments, base::ListValue* result) override;
 			virtual void OnSourceAdded(int index);
 			virtual void OnSourceRemoved(int index);
diff --git a/src/api/screen/screen.js b/src/api/screen/screen.js
@@ -25,6 +25,7 @@ function DesktopCaptureMonitor() {
 }
 require('util').inherits(DesktopCaptureMonitor, exports.Base);
 
+
 DesktopCaptureMonitor.prototype.start = function (screens, windows) {
     if (this.started)
         return false;
@@ -43,6 +44,11 @@ DesktopCaptureMonitor.prototype.stop = function () {
 }
 
 DesktopCaptureMonitor.prototype.on('__nw_desktop_capture_monitor_listner_added', function (id, name, order, type) {
+	if(this.sources.indexOf(id)!=-1)
+	{
+		//TODO: Find out what this event comes twice on some platforms
+		return;
+	}
     this.sources.splice(order, 0, id);
     this.emit("added", id, name, order, type);
     for (var i = order + 1; i <= this.sources.length - 1; i++) {
@@ -51,7 +57,7 @@ DesktopCaptureMonitor.prototype.on('__nw_desktop_capture_monitor_listner_added',
 });
 
 
-DesktopCaptureMonitor.prototype.on('__nw_desktop_capture_monitor_listner_removed', function (index) {
+DesktopCaptureMonitor.prototype.on('__nw_desktop_capture_monitor_listner_removed', function (index) {
     var id = this.sources[index];
     if (index != -1) {
         this.sources.splice(index, 1);
@@ -62,7 +68,7 @@ DesktopCaptureMonitor.prototype.on('__nw_desktop_capture_monitor_listner_removed
     }
 });
 
-DesktopCaptureMonitor.prototype.on('__nw_desktop_capture_monitor_listner_moved', function (id, new_index, old_index) {
+DesktopCaptureMonitor.prototype.on('__nw_desktop_capture_monitor_listner_moved', function (id, new_index, old_index) {
     var temp = this.sources[old_index];
     this.sources.splice(old_index, 1);
     this.sources.splice(new_index, 0, temp);
@@ -71,14 +77,15 @@ DesktopCaptureMonitor.prototype.on('__nw_desktop_capture_monitor_listner_moved',
         this.emit("orderchanged", this.sources[i + 1], i + 1, i);
 });
 
-DesktopCaptureMonitor.prototype.on('__nw_desktop_capture_monitor_listner_namechanged', function (id, name) {
+DesktopCaptureMonitor.prototype.on('__nw_desktop_capture_monitor_listner_namechanged', function (id, name) {
     this.emit("namechanged", id, name);
 });
 
-DesktopCaptureMonitor.prototype.on('__nw_desktop_capture_monitor_listner_thumbnailchanged', function (id, thumbnail) {
+DesktopCaptureMonitor.prototype.on('__nw_desktop_capture_monitor_listner_thumbnailchanged', function (id, thumbnail) {
     this.emit("thumbnailchanged", id, thumbnail);
 });
 
+var listenerCount=0;
 DesktopCaptureMonitor.prototype.on = DesktopCaptureMonitor.prototype.addListener = function (ev, callback) {
     //throw except if unsupported event
     if (ev != "added" && ev != "removed" && ev != "orderchanged" && ev != "namechanged" && ev != "thumbnailchanged")
@@ -87,6 +94,9 @@ DesktopCaptureMonitor.prototype.on = DesktopCaptureMonitor.prototype.addListener
     process.EventEmitter.prototype.addListener.apply(this, arguments);
 }
 
+
+exports.DesktopCaptureMonitor=DesktopCaptureMonitor;
+
 var screenInstance = null;
 
 function Screen() {
