Little things #368

milkdropper · 2020-06-07T12:59:34Z

Some minor things:

disabled the compilation of native presets in msvc.
suppressed some unnecessary debug output so the console is more clear.
made error messages about missing textures more clear (it failed when looking for multiple file extensions).
separated the presets from textures folder. Note: loadTextureDir checks dataDir/presets dataDir/textures and the presetURL itself. It's more logical to separate them, and that's what milkdrop did as well.

…sions.

…sabled)

revmischa · 2020-06-07T14:49:25Z

src/libprojectM/Renderer/TextureManager.hpp

                 std::string datadir = "");
  ~TextureManager();

+  std::vector<std::string> extensions;


pls comment

milkdropper · 2020-06-08T11:54:38Z

I did a lot of testing last night with WASAPI enabled, WASAPI disabled, a single input microphone, and multiple input microphones. Based on this testing I made the following changes (some little, and others bigger):

removed some unnecessary debug from console

Issue: selectAudioInput is legacy
It does nothing and returns 0 by default. I removed this.

Issue: input toggling does not work on Windows
On WASAPI devices input toggling will show a toast message and will output to console you are changing devices, but it doesn't actually start listening to your mic or stop listening to the WASAPI loopback. I made changes so you can jump from WASAPI loopback to microphone and back when toggling devices in Windows. From the end user perspective it will seem like there is an additional input source called "capture loopback".

Here is an example of console output you will see on screen (with some lines redacted). The toast messages are similar:

INFO: GL_VERSION: 3.2.0 NVIDIA 446.14
INFO: GL_SHADING_LANGUAGE_VERSION: 1.50 NVIDIA via Cg compiler
INFO: GL_VENDOR: NVIDIA Corporation
INFO: Opened audio capture loopback.
INFO: Opened audio capture device index=0 devId=2: Headset Microphone (HyperX 7.1 Audio)
INFO: Opened audio capture device index=1 devId=2: Rear Mic (Realtek High Definition Audio)
INFO: Opened audio capture device index=2 devId=2: Stereo Mix (Realtek High Definition Audio)
INFO: Opened audio capture loopback.
INFO: Opened audio capture device index=0 devId=2: Headset Microphone (HyperX 7.1 Audio)
INFO: Opened audio capture device index=1 devId=2: Rear Mic (Realtek High Definition Audio)
INFO: Opened audio capture device index=2 devId=2: Stereo Mix (Realtek High Definition Audio)
INFO: Opened audio capture loopback.

Issue: input toggling will crash Windows (eventually)
Each time you input toggle you will register a new device ID (it keeps incrementing). If you keep toggling eventually it will crash with the error "Too many open audio devices". I changed it so it will end the capture with that device ID and reinitialize so it doesn't keep incrementing. I tested a lot to be sure you can reuse the same device ID and change sources with the device Index you pass to it.

Issue: input toggling is pointless when you are not using WASAPI loopback and there is only one audio source
I changed it so if you only have one audio source then input toggling will do nothing and just produce a message to console.

milkdropper · 2020-06-08T12:19:44Z

So it seems like audio input toggling never worked. The mac issue reported #365 is legitimate and also exists in Windows (when WASAPI is not used). You see information about toggling but never stop listening to the first device.

Edit: to be clear, this PR fixes the issue.

…c so it can be enabled if there is no mic.

revmischa · 2020-06-30T09:37:52Z

msvc/projectMSDL.vcxproj

  </Target>
  <Target Name="Build-Presets" BeforeTargets="PrepareForBuild">
    <Exec Command="xcopy /Y /Q /I &quot;$(MSBuildThisFileDirectory)../presets\presets_tryptonaut&quot; &quot;$(OutDir)presets&quot;" />
+    <Exec Command="xcopy /Y /Q /I &quot;$(MSBuildThisFileDirectory)../presets\textures_tryptonaut&quot; &quot;$(OutDir)textures&quot;" />


any chance we could install all the presets?

Yes of course - I was just going with what was done previously. I am not sure if there was a reason to use tryptonaut presets by default.

revmischa · 2020-06-30T09:38:47Z

src/projectM-sdl/pmSDL.cpp

+        CurAudioDevice++; // iterate device index
+        if (CurAudioDevice >= NumAudioDevices) { // We reached outside the boundaries of available audio devices.
+            CurAudioDevice = 0; // Return to first audio device in the index.
+#ifdef WASAPI_LOOPBACK


would really love to see this code live in "driver" subclasses rather than all #ifdef'd in between the rest of the code in this big file someday

I totally agree the #ifdef stuff looks sloppy and confusing when nested like this. I didn't want to undo what someone else did so I kept with it. But hopefully the comments will keep it OK for now.

I did A LOT of testing so it should work on windows / mac without issue.

src/projectM-sdl/pmSDL.cpp

milkdropper · 2020-07-04T17:08:57Z

I accidentally committed the icon change in c870da3, but since I did I thought it's worth raising.

@coast77777777777 - I assume you made the icon based on the EyeTune concept for the Windows Store. Since you renamed it back from EyeTune to projectM would you consider using this Icon instead? I can share the PSD. I think it's a better idea since it uses the M .tga file from the idle preset and github logo. Here is the image I made

revmischa · 2020-07-25T14:59:44Z

I refactored the texture and preset loading code in #385

revmischa · 2020-07-25T16:41:23Z

src/projectM-sdl/projectM_SDL_main.cpp

    app->init(win, &glCtx);

+	// if using built in settings then default to full screen.
+	if (configFilePath.empty())


I think pmSDL mostly always uses built-in config. It doesn't install the config file by default

revmischa · 2020-07-25T16:42:13Z

src/libprojectM/Renderer/ShaderEngine.cpp

            {
-                std::cerr << "Texture loading error for: " << sampler << std::endl;
+                std::string extensionList = "";
+                // prepare a list of extensions we looked for, so it's more clear what a texture is in error logs.


any extension will work, just the first part of the name should match. i suggest removing this code

This reverts commit b1936e7.

This reverts commit ea89584.

milkdropper · 2020-07-26T17:49:14Z

I reverted:

the extension stuff
the preset / texture folder move stuff (since you are working on that)
the auto fullscreen (that's part of the issue you saw on macOS with Steam - it slows the load and if you don't see the microphone access request it will be a bad first impression).

revmischa

great lets try it

src/projectM-sdl/pmSDL.hpp

milkdropper added 9 commits June 7, 2020 15:27

Noise not needed - F4 shows if shaders are compiled.

d3e430c

Don't compile native presets by default in Visual Studio

d3962f4

Debug / duplicate info

cce18bf

Missed a debug native preset.

84b3b56

Make texture errors more clear - we failed looking for multiple exten…

9a9151b

…sions.

Move images from presets folder to textures folder

d084c2b

Documented missing textures.

9059e09

Undo Visual Studio version bump.

e250cac

Renable NativePresetFactory (but the example native presets remain di…

82522a7

…sabled)

revmischa approved these changes Jun 7, 2020

View reviewed changes

milkdropper added 2 commits June 7, 2020 20:21

Comment

de80a14

Fixes / updates to audio device toggling.

5fd5bbc

milkdropper mentioned this pull request Jun 8, 2020

Input device toggle does not work on OSX 10.14.6 #365

Closed

milkdropper added 4 commits June 12, 2020 14:15

Stop crashing if there is no input microphone. Make fake audio dynami…

a015013

…c so it can be enabled if there is no mic.

Remove debug output.

63b3245

Document VC++ redist requirement.

decdeb5

F4 missing from SDL help menu.

0574c67

milkdropper requested a review from revmischa June 26, 2020 14:16

revmischa approved these changes Jun 30, 2020

View reviewed changes

milkdropper added 4 commits July 4, 2020 20:38

Windows app instead of Console (no more cmd.exe pop-up when launching).

c870da3

Fullscreen for built-in settings.

b1936e7

New icon (based on github and idle preset and consistent with Steam)

c187a77

Change language for loopback / audio changing.

f779657

default fullscreen for built-in settings.

ea89584

revmischa mentioned this pull request Jul 25, 2020

Vendor SDL2.framework #386

Merged

revmischa closed this in #386 Jul 25, 2020

revmischa reopened this Jul 25, 2020

revmischa reviewed Jul 25, 2020

View reviewed changes

milkdropper added 4 commits July 26, 2020 21:31

Revert "Fullscreen for built-in settings."

8860432

This reverts commit b1936e7.

Revert "default fullscreen for built-in settings."

c4d4ec9

This reverts commit ea89584.

Revert "9a9151b9"

8ba5d59

9a9151b

421dfb4

revmischa approved these changes Jul 26, 2020

View reviewed changes

src/projectM-sdl/pmSDL.hpp Outdated Show resolved Hide resolved

fake_audio to fakeAudio

b89e761

revmischa merged commit c5533e3 into projectM-visualizer:master Jul 28, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Little things #368

Little things #368

Uh oh!

milkdropper commented Jun 7, 2020

Uh oh!

revmischa Jun 7, 2020

Uh oh!

milkdropper commented Jun 8, 2020 •

edited

Loading

Uh oh!

milkdropper commented Jun 8, 2020 •

edited

Loading

Uh oh!

revmischa Jun 30, 2020

Uh oh!

milkdropper Jul 4, 2020

Uh oh!

revmischa Jun 30, 2020

Uh oh!

milkdropper Jul 4, 2020

Uh oh!

Uh oh!

Uh oh!

milkdropper commented Jul 4, 2020 •

edited

Loading

Uh oh!

revmischa commented Jul 25, 2020

Uh oh!

revmischa Jul 25, 2020

Uh oh!

revmischa Jul 25, 2020

Uh oh!

milkdropper commented Jul 26, 2020

Uh oh!

revmischa left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Little things #368

Little things #368

Uh oh!

Conversation

milkdropper commented Jun 7, 2020

Uh oh!

revmischa Jun 7, 2020

Choose a reason for hiding this comment

Uh oh!

milkdropper commented Jun 8, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

milkdropper commented Jun 8, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

revmischa Jun 30, 2020

Choose a reason for hiding this comment

Uh oh!

milkdropper Jul 4, 2020

Choose a reason for hiding this comment

Uh oh!

revmischa Jun 30, 2020

Choose a reason for hiding this comment

Uh oh!

milkdropper Jul 4, 2020

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

milkdropper commented Jul 4, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

revmischa commented Jul 25, 2020

Uh oh!

revmischa Jul 25, 2020

Choose a reason for hiding this comment

Uh oh!

revmischa Jul 25, 2020

Choose a reason for hiding this comment

Uh oh!

milkdropper commented Jul 26, 2020

Uh oh!

revmischa left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

milkdropper commented Jun 8, 2020 •

edited

Loading

milkdropper commented Jun 8, 2020 •

edited

Loading

milkdropper commented Jul 4, 2020 •

edited

Loading