rexy712/our_dick
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Maybe fixed the glitchiness at startup even more?

Browse Source
This commit is contained in:
rexy712 2020-08-22 15:50:52 -07:00
parent dd7ccc85b9
commit fa5c203cf8
5 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/audio/detail.hpp
View File

@ -29,8 +29,10 @@ namespace audio::detail{
std::tuple<Args...> m_args; std::tuple<Args...> m_args;
template<int... Indices> template<int... Indices>
int operator()(const void* input, void* output, unsigned long frame_count, std::integer_sequence<int,Indices...>){ int operator()(const void* input, void* output, unsigned long frame_count,
return std::forward<Func>(m_f)(input, output, frame_count, std::get<Indices>(m_args)...); unsigned long flags, std::integer_sequence<int,Indices...>)
{
return std::forward<Func>(m_f)(input, output, frame_count, flags, std::get<Indices>(m_args)...);
} }
}; };
@ -40,7 +42,7 @@ namespace audio::detail{
callback_iface() = default; callback_iface() = default;
virtual ~callback_iface() = default; virtual ~callback_iface() = default;
virtual int operator()(const void* input, void* output, unsigned long frame_count) = 0; virtual int operator()(const void* input, void* output, unsigned long frame_count, unsigned long flags) = 0;
}; };
template<typename Func, typename... Args> template<typename Func, typename... Args>
@ -52,8 +54,8 @@ namespace audio::detail{
template<class Fn, class... Ts> template<class Fn, class... Ts>
callback_impl(Fn&& f, Ts&&... ts): callback_impl(Fn&& f, Ts&&... ts):
m_ch{std::forward<Fn>(f), {std::forward<Ts>(ts)...}}{} m_ch{std::forward<Fn>(f), {std::forward<Ts>(ts)...}}{}
int operator()(const void* input, void* output, unsigned long frame_count)override{ int operator()(const void* input, void* output, unsigned long frame_count, unsigned long flags)override{
return m_ch(input, output, frame_count, typename ::util::sequence_gen<sizeof...(Args)>::type{}); return m_ch(input, output, frame_count, flags, typename ::util::sequence_gen<sizeof...(Args)>::type{});
} }
}; };
} }

2
include/audio/impl/mixer.hpp
View File

@ -68,7 +68,7 @@ namespace audio::impl{
void exit(); void exit();
size_t output_channels()const; size_t output_channels()const;
private: private:
static int callback(const void* /*input*/, void* output, unsigned long frame_count, mixer& mix); static int callback(const void* /*input*/, void* output, unsigned long frame_count, unsigned long flags, mixer& mix);
}; };
} }

4
src/audio/impl/mixer.cpp
View File

@ -100,7 +100,9 @@ namespace audio::impl{
size_t mixer::output_channels()const{ size_t mixer::output_channels()const{
return m_output_sink.output_count(); return m_output_sink.output_count();
} }
int mixer::callback(const void* /*input*/, void* output, unsigned long frame_count, mixer& mix){ int mixer::callback(const void* /*input*/, void* output, unsigned long frame_count, unsigned long flags, mixer& mix){
if(flags & paPrimingOutput)
return paContinue;
//mark mixer data as being processed //mark mixer data as being processed
mix.set_active(true); mix.set_active(true);

4
src/audio/stream.cpp
View File

@ -81,11 +81,11 @@ namespace audio{
return Pa_OpenStream(stream, inp, outp, samplerate, paFramesPerBufferUnspecified, paNoFlag, callback, cb); return Pa_OpenStream(stream, inp, outp, samplerate, paFramesPerBufferUnspecified, paNoFlag, callback, cb);
} }
int stream::callback(const void* input, void* output, unsigned long framecount, int stream::callback(const void* input, void* output, unsigned long framecount,
const PaStreamCallbackTimeInfo* /*timeInfo*/, PaStreamCallbackFlags /*statusFlags*/, const PaStreamCallbackTimeInfo* timeinfo, PaStreamCallbackFlags statusflags,
void* userdata) void* userdata)
{ {
detail::callback_iface* cb = static_cast<detail::callback_iface*>(userdata); detail::callback_iface* cb = static_cast<detail::callback_iface*>(userdata);
return (*cb)(input, output, framecount); return (*cb)(input, output, framecount, statusflags);
} }
} }

1
src/main.cpp
View File

@ -143,7 +143,6 @@ void gay_thread(audio::mixer& m, std::atomic_bool& should_gay_thread_stop){
int main(){ int main(){
srand(time(NULL)); srand(time(NULL));
audio::mixer mix(audio::mixer::mode::STEREO, 1); audio::mixer mix(audio::mixer::mode::STEREO, 1);
audio::mixchunk ch = read_audio_file(select_audio_file().c_str());
game_state gs = {}; game_state gs = {};
manager.init(640, 480, "Tic-Tac-Gugh"); manager.init(640, 480, "Tic-Tac-Gugh");