@@ -113,8 +113,6 @@ public void AddDevice(SsdpRootDevice device)
113
113
{
114
114
//_MinCacheTime = minCacheTime;
115
115
116
- ConnectToDeviceEvents ( device ) ;
117
-
118
116
WriteTrace ( "Device Added" , device ) ;
119
117
120
118
SetRebroadcastAliveNotificationsTimer ( minCacheTime ) ;
@@ -152,8 +150,6 @@ public async Task RemoveDevice(SsdpRootDevice device)
152
150
{
153
151
//_MinCacheTime = minCacheTime;
154
152
155
- DisconnectFromDeviceEvents ( device ) ;
156
-
157
153
WriteTrace ( "Device Removed" , device ) ;
158
154
159
155
await SendByeByeNotifications ( device , true , CancellationToken . None ) . ConfigureAwait ( false ) ;
@@ -527,9 +523,8 @@ private Task SendByeByeNotification(SsdpDevice device, string notificationType,
527
523
var message = BuildMessage ( header , values ) ;
528
524
529
525
var sendCount = IsDisposed ? 1 : 3 ;
526
+ WriteTrace ( String . Format ( "Sent byebye notification" ) , device ) ;
530
527
return _CommsServer . SendMulticastMessage ( message , sendCount , cancellationToken ) ;
531
-
532
- //WriteTrace(String.Format("Sent byebye notification"), device);
533
528
}
534
529
535
530
#endregion
@@ -630,50 +625,10 @@ private void WriteTrace(string text, SsdpDevice device)
630
625
WriteTrace ( text + " " + device . DeviceType + " - " + device . Uuid ) ;
631
626
}
632
627
633
- private void ConnectToDeviceEvents ( SsdpDevice device )
634
- {
635
- device . DeviceAdded += device_DeviceAdded ;
636
- device . DeviceRemoved += device_DeviceRemoved ;
637
-
638
- foreach ( var childDevice in device . Devices )
639
- {
640
- ConnectToDeviceEvents ( childDevice ) ;
641
- }
642
- }
643
-
644
- private void DisconnectFromDeviceEvents ( SsdpDevice device )
645
- {
646
- device . DeviceAdded -= device_DeviceAdded ;
647
- device . DeviceRemoved -= device_DeviceRemoved ;
648
-
649
- foreach ( var childDevice in device . Devices )
650
- {
651
- DisconnectFromDeviceEvents ( childDevice ) ;
652
- }
653
- }
654
-
655
628
#endregion
656
629
657
630
#region Event Handlers
658
631
659
- private void device_DeviceAdded ( object sender , DeviceEventArgs e )
660
- {
661
- if ( IsDisposed )
662
- {
663
- return ;
664
- }
665
-
666
- SendAliveNotifications ( e . Device , false , CancellationToken . None ) ;
667
- ConnectToDeviceEvents ( e . Device ) ;
668
- }
669
-
670
- private void device_DeviceRemoved ( object sender , DeviceEventArgs e )
671
- {
672
- var task = SendByeByeNotifications ( e . Device , false , CancellationToken . None ) ;
673
- Task . WaitAll ( task ) ;
674
- DisconnectFromDeviceEvents ( e . Device ) ;
675
- }
676
-
677
632
private void CommsServer_RequestReceived ( object sender , RequestReceivedEventArgs e )
678
633
{
679
634
if ( this . IsDisposed ) return ;
0 commit comments