Skip to content

Replaced destructor with Dispose(), and added InvalidOperationExcept… #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jacobvc wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Replaced destructor with Dispose(), and added InvalidOperationExcept… #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions ViscaLibrary/ViscaProtocolProcessor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public static T Dequeue<T>(this BlockingCollection<T> queue)
}
#endif

public class ViscaProtocolProcessor
public class ViscaProtocolProcessor : IDisposable
{
private readonly Dictionary<ViscaCameraId, ViscaCamera> _cameras = new Dictionary<ViscaCameraId, ViscaCamera>(7);

Expand Down Expand Up @@ -118,13 +118,13 @@ public ViscaProtocolProcessor(Action<byte[]> sendData, Action<byte, string, obje
#endif
}

#if !SSHARP
~ViscaProtocolProcessor()
public void Dispose()
{
#if !SSHARP
_responseQueue.CompleteAdding();
_responseQueueCancel.Cancel(false);
}
#endif
}

/// <summary>
/// Commands in the sending queue
Expand Down Expand Up @@ -324,6 +324,11 @@ private void parseResponse(object obj)
logMessage(2, "Visca Response Queue shutdown");
break;
}
catch (InvalidOperationException)
{
logMessage(2, "Visca Response Queue shutdown 2");
break;
}
#endif
catch (Exception e)
{
Expand Down