Skip to content

Updated Freeboy files from Game Music Emu 0.6.1 - #3618

Merged
tresf merged 1 commit into
LMMS:masterfrom
karmux:gb_apu_update
Jul 14, 2017
Merged

tresf merged 1 commit into
LMMS:masterfrom
karmux:gb_apu_update

Conversation

@karmux

@karmux karmux commented Jun 6, 2017 •

Copy link
Copy Markdown
Contributor

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 Compare June 6, 2017 22:34
@zonkmachine

Copy link
Copy Markdown
Contributor

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

freeboyfix

@karmux karmux mentioned this pull request Jun 7, 2017

@zonkmachine zonkmachine left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

karmux commented Jun 20, 2017 •

Copy link
Copy Markdown
Contributor Author

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
Copy Markdown
Contributor

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
zonkmachine pushed a commit to zonkmachine/lmms that referenced this pull request Jul 23, 2017
Uses upstream files to fix LMMS#326

[oskar.wallgren13@gmail.com: backported from master]
sdasda7777 pushed a commit to sdasda7777/lmms that referenced this pull request Jun 28, 2022
sdasda7777 pushed a commit to sdasda7777/lmms that referenced this pull request Jun 28, 2022
Uses upstream files to fix LMMS#326

[oskar.wallgren13@gmail.com: backported from master]
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants