Add ASIO Image #824

rousseldenis · 2021-10-31T16:05:34Z

No description provided.

rousseldenis · 2021-10-31T16:06:11Z

src/core/SplashScreen.cpp

@@ -73,6 +88,9 @@ GOrgueSplash::GOrgueSplash(bool has_timeout, wxWindow *parent, wxWindowID id) :
 	SetExtraStyle(GetExtraStyle() | wxWS_EX_TRANSIENT);
 	wxBitmap bitmap = GetImage_Splash();
 	DrawText(bitmap);
+    /* Set ASIO license image */


@larspalo @oleg68 I'm not sure on how to instantiate image.

rousseldenis · 2021-10-31T17:17:53Z

Here a first preview

Scaling of original image is not perfect

rousseldenis · 2021-10-31T17:23:39Z

Ok, found the correct quality argument.

rousseldenis · 2021-10-31T17:24:50Z

@larspalo @oleg68 This one is ready

oleg68 · 2021-10-31T18:29:19Z

@rousseldenis

I can't see the asio image on the splash screen
Please add an entry in the CHANGELOG.md
Do we still need to display the text about ASIO on the bottom on the splash?
Do we need show the image only under Windows or we should do it under other platforms, where ASIO is not used?

larspalo · 2021-10-31T19:01:06Z

4\. Do we need show the image only under Windows or we should do it under other platforms, where ASIO is not used?

I think we only need to mention ASIO at all if it's included in the distributed build.

rousseldenis · 2021-10-31T19:07:42Z

Here is a part of license concerning logo Le dim. 31 oct. 2021 à 20:01, larspalo ***@***.***> a écrit :

…

4\. Do we need show the image only under Windows or we should do it under other platforms, where ASIO is not used? I think we only need to mention ASIO at all if it's included in the distributed build. — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub <#824 (comment)>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/AEU76PJ5LAI3IKGDATSEHQLUJWG73ANCNFSM5HCOC4JA> .

larspalo · 2021-10-31T19:10:47Z

@rousseldenis What?

rousseldenis · 2021-10-31T19:26:34Z

Here is a part of license concerning logo Le dim. 31 oct. 2021 à 20:01, larspalo @.***> a écrit :
…
4. Do we need show the image only under Windows or we should do it under other platforms, where ASIO is not used? I think we only need to mention ASIO at all if it's included in the distributed build. — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub <#824 (comment)>, or unsubscribe https://github.com/notifications/unsubscribe-auth/AEU76PJ5LAI3IKGDATSEHQLUJWG73ANCNFSM5HCOC4JA .

Mmmh, GitHub don't like email attachments. I will send license

rousseldenis · 2021-11-01T11:28:22Z

rousseldenis · 2021-11-01T11:35:18Z

@oleg68 Did you build on my branch (two exist with 'asio' in name) ?

I did it several times from scratch and I have the good result

rousseldenis · 2021-11-01T11:44:57Z

Do we still need to display the text about ASIO on the bottom on the splash?

Do we need show the image only under Windows or we should do it under other platforms, where ASIO is not used?

3 => I'll take the license assertion 'the ASIO compatible Logo and Steinberg’s copyrights notice'
4 => As soon as the library is included in the whole software, it should

larspalo · 2021-11-01T14:02:02Z

Well, if you read the initial 1. statement, I think you'd be hard pressed to find any code that's using or is based on the ASIO driver/ in any GO distributed binary except the windows builds... In the others I'd consider it false marketing... But if we distribute windows builds with ASIO, we should of course mention it in the documentation and on the project website(s) like suggested.

rousseldenis · 2021-11-01T14:37:55Z

In the others I'd consider it false marketing

Indeed. So, what do we do ?

larspalo · 2021-11-01T14:58:15Z

We can

Use different splash screen content for different builds (if ASIO is included or not)
State that the ASIO lines are only valid for windows builds that include ASIO
Do something different...

rousseldenis · 2021-11-01T15:00:10Z

Use different splash screen content for different builds (if ASIO is included or not)

I like this even if I don't know (yet) how to do it, but quite difficult.

State that the ASIO lines are only valid for windows builds that include ASIO

More easy.

oleg68 · 2021-11-01T17:12:33Z

@oleg68 Did you build on my branch (two exist with 'asio' in name) ?

I did it several times from scratch and I have the good result

I used the github build result from https://github.com/rousseldenis/grandorgue/actions/runs/1405200626

rousseldenis · 2021-11-01T17:17:04Z

@oleg68 Did you build on my branch (two exist with 'asio' in name) ?
I did it several times from scratch and I have the good result

I used the github build result from https://github.com/rousseldenis/grandorgue/actions/runs/1405200626

Mmmh I see, you took an old build, I commited twice. So, you need to get this https://github.com/rousseldenis/grandorgue/actions/runs/1407748122

oleg68 · 2021-11-01T17:45:45Z

Mmmh I see, you took an old build, I commited twice. So, you need to get this https://github.com/rousseldenis/grandorgue/actions/runs/1407748122

Yes, this build works.

oleg68 · 2021-11-01T17:59:28Z

Use different splash screen content for different builds (if ASIO is included or not)

I like this even if I don't know (yet) how to do it, but quite difficult.

It is not so difficult:

#ifdef ASIO_INCLUDED
    /* Set ASIO license image */
    wxImage asio = GetImage_ASIO();
    wxBitmap m_asio = (wxBitmap)asio.Scale(asio.GetWidth() * 0.1, asio.GetHeight() * 0.1, wxIMAGE_QUALITY_HIGH);
    dc.DrawBitmap(m_asio, 70, 10);
#endif

And to add the folowing code in the CMakeLists.txt:

if(RTAUDIO_USE_ASIO)
  add_definitions(-DASIO_INCLUDED)
endif()

rousseldenis · 2021-11-02T06:40:42Z

@oleg68 Done

oleg68 · 2021-11-02T07:13:12Z

CMakeLists.txt

@@ -68,6 +68,11 @@ else ()
 endif ()
 option(GO_SEPARATE_LINUX_PACKAGES "Generate separate linux packages for resources and demo" OFF)

+# Add ASIO variable
+if(RTAUDIO_USE_ASIO)


Could you move this below in the file, before if(RTAUDIO_USE_ASIO AND NOT ASIO_SDK_DIR)? It'd better to have all asio-related things at one place.

Ok, I looked quickly but didn't find them.

And it still doesn't work on linux.

Try to use if(WIN32 AND RTAUDIO_USE_ASIO)

oleg68 · 2021-11-07T06:26:55Z

@rousseldenis I've created a PR to your repo that solves displaying th ASIO image on linux and mac. Could you take a look?

oleg68 · 2021-11-07T07:56:36Z

@rousseldenis I've tested the last version https://github.com/rousseldenis/grandorgue/actions/runs/1430943236

Unfortunnally if the version is too long then the asio image overlappes the version number

Could you try to move the image below?

rousseldenis · 2021-11-07T09:19:34Z

Yes of course. I noticed it but unfortunately didn't have the time yet.

oleg68 · 2021-11-09T19:26:48Z

@rousseldenis I submitted rousseldenis#4

After merging it the only thing rests for you is resolving a conflict in CHANGELOG.md

rousseldenis · 2021-11-11T11:49:23Z

@larspalo @oleg68 This one is ready

oleg68 · 2021-11-11T12:51:48Z

@rousseldenis please resolve the conflict

rousseldenis · 2021-11-11T12:55:11Z

@rousseldenis please resolve the conflict

Done

oleg68 · 2021-11-11T12:58:25Z

src/core/SplashScreen.cpp

@@ -34,8 +34,12 @@ BEGIN_EVENT_TABLE(GOSplashBitmap, wxControl)
 	EVT_KEY_DOWN(GOSplashBitmap::OnKey)
 END_EVENT_TABLE()

+<<<<<<< HEAD


It does nott work. Please leave the only line

GOSplashBitmap::GOSplashBitmap(wxWindow *parent, wxWindowID id, wxBitmap& bitmap) :

oleg68

Please remove the <<< and >>> lines

rousseldenis · 2021-11-11T12:59:58Z

Please remove the <<< and >>> lines

Wrong behaviour in my editor. :-)

oleg68 · 2021-11-13T11:57:04Z

@rousseldenis

The ASIO copyright also should be displayed only on windows. And the ASIO sdk version number must be updated.

Please replace in the SplashScreen.cpp:

	wxString msg = _("Copyright 2006 Milan Digital Audio LLC\nCopyright 2009-2021 GrandOrgue contributors\n\nThis software comes with no warranty.\n\nASIO Interface Technology by Steinberg Media Technologies GmbH,\nby use of the Steinberg ASIO SDK, Version 2.2.\nASIO is a trademark and software of Steinberg Media Technologies GmbH.");
	dc.DrawLabel(msg, wxRect(60, 62, 370, 100), wxALIGN_CENTER_HORIZONTAL | wxALIGN_CENTER_VERTICAL);

with

	wxString msg = _("Copyright 2006 Milan Digital Audio LLC\nCopyright 2009-2021 GrandOrgue contributors\n\nThis software comes with no warranty");
	dc.DrawLabel(msg, wxRect(60, 72, 370, 40), wxALIGN_CENTER_HORIZONTAL | wxALIGN_CENTER_VERTICAL);
    #ifdef ASIO_INCLUDED
	font = *wxNORMAL_FONT;
	font.SetWeight(wxFONTWEIGHT_NORMAL);
	font.SetPointSize(7);
	dc.SetFont(font);
	msg = _("ASIO Interface Technology by Steinberg Media Technologies GmbH,\nby use of the Steinberg ASIO SDK, Version 2.3.3.\nASIO is a trademark and software of Steinberg Media Technologies GmbH.");
	dc.DrawLabel(msg, wxRect(60, 122, 370, 40), wxALIGN_CENTER_HORIZONTAL | wxALIGN_CENTER_VERTICAL);
    #endif

rousseldenis commented Oct 31, 2021

View reviewed changes

rousseldenis force-pushed the add_asio_about-dro branch from 50c8777 to 7da7021 Compare October 31, 2021 17:12

rousseldenis changed the title ~~[WIP] Add ASIO Image~~ Add ASIO Image Oct 31, 2021

rousseldenis force-pushed the add_asio_about-dro branch from 7da7021 to 63c8539 Compare October 31, 2021 17:14

rousseldenis linked an issue Oct 31, 2021 that may be closed by this pull request

ASIO: Add image to 'About' #823

Closed

rousseldenis added enhancement New feature or request needs review labels Oct 31, 2021

rousseldenis added this to the 3.4.2 milestone Oct 31, 2021

rousseldenis force-pushed the add_asio_about-dro branch from 63c8539 to 3ded14b Compare October 31, 2021 17:24

rousseldenis closed this Oct 31, 2021

rousseldenis reopened this Oct 31, 2021

rousseldenis force-pushed the add_asio_about-dro branch from 3ded14b to 21000e2 Compare November 1, 2021 11:51

oleg68 reviewed Nov 2, 2021

View reviewed changes

oleg68 modified the milestone: 3.4.2 Nov 3, 2021

rousseldenis force-pushed the add_asio_about-dro branch from e3059f1 to 2acf98a Compare November 11, 2021 11:48

rousseldenis added 2 commits November 11, 2021 13:54

[IMP] Add ASIO Image to Splash Screen

40c72e1

[IMP] ASIO: Use global variable to display icon or not

d8dfc5e

rousseldenis force-pushed the add_asio_about-dro branch from 2acf98a to 1b49225 Compare November 11, 2021 12:54

oleg68 reviewed Nov 11, 2021

View reviewed changes

oleg68 requested changes Nov 11, 2021

View reviewed changes

Fixed displaying ASIO image on non-windows systems

f8ec9b0

rousseldenis force-pushed the add_asio_about-dro branch from 1b49225 to f8ec9b0 Compare November 11, 2021 13:01

oleg68 mentioned this pull request Nov 14, 2021

Added asio image on the about screen #848

Merged

oleg68 added the duplicate This issue or pull request already exists label Nov 14, 2021

rousseldenis closed this Nov 14, 2021

rousseldenis removed a link to an issue Nov 14, 2021

ASIO: Add image to 'About' #823

Closed

Add ASIO Image #824

Add ASIO Image #824

Conversation

rousseldenis commented Oct 31, 2021

rousseldenis Oct 31, 2021

Choose a reason for hiding this comment

rousseldenis Oct 31, 2021

Choose a reason for hiding this comment

rousseldenis commented Oct 31, 2021

rousseldenis commented Oct 31, 2021

rousseldenis commented Oct 31, 2021

oleg68 commented Oct 31, 2021

larspalo commented Oct 31, 2021

rousseldenis commented Oct 31, 2021 via email

larspalo commented Oct 31, 2021

rousseldenis commented Oct 31, 2021

rousseldenis commented Nov 1, 2021

rousseldenis commented Nov 1, 2021 • edited Loading

rousseldenis commented Nov 1, 2021

larspalo commented Nov 1, 2021

rousseldenis commented Nov 1, 2021

larspalo commented Nov 1, 2021

rousseldenis commented Nov 1, 2021

oleg68 commented Nov 1, 2021

rousseldenis commented Nov 1, 2021

oleg68 commented Nov 1, 2021

oleg68 commented Nov 1, 2021 • edited Loading

rousseldenis commented Nov 2, 2021

oleg68 Nov 2, 2021

Choose a reason for hiding this comment

rousseldenis Nov 2, 2021

Choose a reason for hiding this comment

oleg68 Nov 2, 2021

Choose a reason for hiding this comment

oleg68 commented Nov 7, 2021

oleg68 commented Nov 7, 2021

rousseldenis commented Nov 7, 2021

oleg68 commented Nov 9, 2021

rousseldenis commented Nov 11, 2021

oleg68 commented Nov 11, 2021

rousseldenis commented Nov 11, 2021

oleg68 Nov 11, 2021

Choose a reason for hiding this comment

oleg68 left a comment

Choose a reason for hiding this comment

rousseldenis commented Nov 11, 2021

oleg68 commented Nov 13, 2021 • edited Loading

rousseldenis commented Nov 1, 2021 •

edited

Loading

oleg68 commented Nov 1, 2021 •

edited

Loading

oleg68 commented Nov 13, 2021 •

edited

Loading