Skip to content
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

add bitmap support #171

Open
wants to merge 12 commits into
base: dev
Choose a base branch
from
Open

add bitmap support #171

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
6144813
Fixed Config references to ExecutingAssembly (#128)
csharpfritz Feb 20, 2019
8fa7316
Release test project fix (#130)
csharpfritz Feb 20, 2019
feff800
Merge pull request #132 from FritzAndFriends/dev
csharpfritz Feb 20, 2019
067648f
Merge pull request #143 from FritzAndFriends/dev
csharpfritz Feb 27, 2019
06cb3db
Merge pull request #151 from FritzAndFriends/dev
csharpfritz Jun 7, 2020
92ffc13
Merge pull request #165 from FritzAndFriends/dev
csharpfritz Jan 5, 2021
5ed9061
Merge pull request #167 from FritzAndFriends/dev
csharpfritz Jan 5, 2021
f02a3b5
add png image support
BenjaminAbt Apr 7, 2021
09fde78
remove unused using
BenjaminAbt Apr 7, 2021
81be1ec
Merge branch 'master' of https://github.com/BenjaminAbt/StreamDeckToo…
BenjaminAbt Jun 8, 2021
a984d76
add image data method
BenjaminAbt Jun 11, 2021
66ebfb4
fix info name
BenjaminAbt Jun 11, 2021
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
29 changes: 29 additions & 0 deletions src/StreamDeckLib/ConnectionManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
using System;
using System.Diagnostics;
using System.IO;
using System.Drawing;
using System.Drawing.Imaging;
using System.Net.WebSockets;
using System.Threading;
using System.Threading.Tasks;
Expand Down Expand Up @@ -260,6 +262,33 @@ public async Task SetImageAsync(string context, string imageLocation)
await _proxy.SendStreamDeckEvent(args);
}

public async Task SetPngImageAsync(string context, Bitmap image)
BenjaminAbt marked this conversation as resolved.
Show resolved Hide resolved
{
Debug.WriteLine("Getting Image from Bitmap");
_logger?.LogDebug("Getting Image from Bitmap");

byte[] imgBytes;
using (var imgByteStream = new MemoryStream())
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

at this point we could use https://github.com/microsoft/Microsoft.IO.RecyclableMemoryStream

{
image.Save(imgByteStream, ImageFormat.Png);// force use png
imgBytes = imgByteStream.ToArray();
}
var imgString = Convert.ToBase64String(imgBytes, Base64FormattingOptions.None);

var args = new SetImageArgs
{
context = context,
payload = new SetImageArgs.Payload
{
TargetType = SetTitleArgs.TargetType.HardwareAndSoftware,
image = $"data:image/png;base64, {imgString}"
}
};

await _proxy.SendStreamDeckEvent(args);
}


public async Task ShowAlertAsync(string context)
{
var args = new ShowAlertArgs()
Expand Down
1 change: 1 addition & 0 deletions src/StreamDeckLib/StreamDeckLib.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
<PackageReference Include="Microsoft.Extensions.Http" Version="3.1.3" />
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="3.1.3" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
<PackageReference Include="System.Drawing.Common" Version="5.0.0" />
</ItemGroup>

<ItemGroup>
Expand Down