Skip to content

Commit

Permalink
Merge branch 'main' of https://github.com/Rezonality/Zing
Browse files Browse the repository at this point in the history
  • Loading branch information
cmaughan committed Sep 14, 2023
2 parents f017dac + 8a77dd8 commit f94102c
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 1 deletion.
2 changes: 2 additions & 0 deletions app/demo.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,8 @@ void demo_tick()
}
}
}

// Unlock the audio, since we are fully loaded now.
ctx.audioTickEnableMutex.unlock();
}
}
Expand Down
1 change: 1 addition & 0 deletions include/zing/audio/audio.h
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ inline bool operator==(const SpectrumPartitionSettings& a, const SpectrumPartiti
return ((a.limit == b.limit) && (a.n == b.n) && (a.sharpness == b.sharpness));
}

// Channel_In/Out/?, count
using ChannelId = std::pair<uint32_t, uint32_t>;

struct AudioAnalysis
Expand Down
5 changes: 5 additions & 0 deletions src/audio/audio.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -669,6 +669,9 @@ void audio_destroy()
{
auto& ctx = audioContext;

// Unlock the audio, since we are fully loaded now.
ctx.audioTickEnableMutex.lock();

// Stop the analysis
audio_analysis_destroy_all();

Expand All @@ -686,6 +689,8 @@ void audio_destroy()
sp_destroy(&ctx.pSP);
ctx.pSP = nullptr;
}

ctx.audioTickEnableMutex.unlock();
}

void audio_add_settings_hooks()
Expand Down
1 change: 1 addition & 0 deletions src/audio/midi.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#include <zing/pch.h>
#include <zest/file/file.h>
#include <zest/logger/logger.h>

#include <libremidi/libremidi.hpp>
#include <libremidi/reader.hpp>
Expand Down
1 change: 0 additions & 1 deletion subs.bat
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
git pull
git submodule update --init --recursive
cd libs/zest
git checkout main
git pull
Expand Down

0 comments on commit f94102c

Please sign in to comment.