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.

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

Updated Freeboy files from Game Music Emu 0.6.1 #3618

Merged
merged 1 commit into from Jul 14, 2017
Merged

Conversation

@karmux
Copy link
Contributor

@karmux karmux commented Jun 6, 2017

Following files are from new upstream package:

plugins/papu/gb_apu/Blip_Buffer.cpp  
plugins/papu/gb_apu/Blip_Buffer.h
plugins/papu/gb_apu/Blip_Synth.h 
plugins/papu/gb_apu/Gb_Apu.cpp 
plugins/papu/gb_apu/Gb_Apu.h
plugins/papu/gb_apu/Gb_Oscs.cpp 
plugins/papu/gb_apu/Gb_Oscs.h
plugins/papu/gb_apu/Multi_Buffer.cpp
plugins/papu/gb_apu/Multi_Buffer.h
plugins/papu/gb_apu/blargg_common.h
plugins/papu/gb_apu/blargg_config.h
plugins/papu/gb_apu/blargg_source.h

These files were updated to work with latest upstream files:

plugins/papu/Basic_Gb_Apu.cpp
plugins/papu/Basic_Gb_Apu.h
plugins/papu/CMakeLists.txt
@karmux karmux force-pushed the gb_apu_update branch 2 times, most recently from f77860b to f9ad1e2 Jun 6, 2017
@karmux karmux force-pushed the gb_apu_update branch from f9ad1e2 to dc4ae74 Jun 6, 2017
@zonkmachine
Copy link
Member

@zonkmachine zonkmachine commented Jun 6, 2017

stable-1.2-rc3 with (top) and without (bottom) @karmux fix.

freeboyfix

@karmux karmux mentioned this pull request Jun 7, 2017
Copy link
Member

@zonkmachine zonkmachine left a comment

I think this should be merged. It's an updated upstream package and it fixes #326. The only local adaptation is one line in plugins/papu/CMakeLists.txt .

@karmux
Copy link
Contributor Author

@karmux karmux commented Jun 20, 2017

The only local adaptation is one line in plugins/papu/CMakeLists.txt

plugins/papu/Basic_Gb_Apu.h and plugins/papu/Basic_Gb_Apu.cpp too. They were not anymore in 0.6.1.

@zonkmachine
Copy link
Member

@zonkmachine zonkmachine commented Jun 21, 2017

OK. Can you then add a description and tell us what's in this PR?

@tresf tresf merged commit aaf09bb into LMMS:master Jul 14, 2017
1 check passed
@Umcaruje Umcaruje added this to Done in Release 1.2.0 RC4 Jul 14, 2017
@Umcaruje Umcaruje moved this from Done to To Do in Release 1.2.0 RC4 Jul 14, 2017
zonkmachine added a commit to zonkmachine/lmms that referenced this issue Jul 23, 2017
Uses upstream files to fix LMMS#326

[oskar.wallgren13@gmail.com: backported from master]
@zonkmachine zonkmachine moved this from To Do to In Progress in Release 1.2.0 RC4 Jul 23, 2017
@zonkmachine zonkmachine moved this from In Progress to Done in Release 1.2.0 RC4 Jul 24, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
No open projects
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants