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.

Sign up for GitHub

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

Jump to bottom

Updated Freeboy files from Game Music Emu 0.6.1 #3618

Merged
merged 1 commit into from
Jul 14, 2017
Merged

Updated Freeboy files from Game Music Emu 0.6.1 #3618

merged 1 commit into from
Jul 14, 2017

Conversation

karmux
Copy link
Contributor

@karmux karmux commented Jun 6, 2017 •
edited
Loading

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
Member

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

freeboyfix

@karmux karmux mentioned this pull request Jun 7, 2017
Closed
zonkmachine
zonkmachine approved these changes Jun 20, 2017
View reviewed changes
Copy link
Member

@zonkmachine zonkmachine left a comment

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
Copy link
Contributor Author

karmux commented Jun 20, 2017 •
edited
Loading

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

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
@karmux @zonkmachine
Updated Freeboy files from Game Music Emu 0.6.1. (LMMS#3618)
587989b 
Uses upstream files to fix LMMS#326

[oskar.wallgren13@gmail.com: backported from master]
@zonkmachine zonkmachine mentioned this pull request Nov 6, 2017
Open
@tresf tresf mentioned this pull request Aug 29, 2021
Open
sdasda7777 pushed a commit to sdasda7777/lmms that referenced this pull request Jun 28, 2022
@karmux @tresf
Updated Freeboy files from Game Music Emu 0.6.1. (LMMS#3618)
3f10fbb 
Uses upstream files to fix LMMS#326
sdasda7777 pushed a commit to sdasda7777/lmms that referenced this pull request Jun 28, 2022
@karmux @zonkmachine
Updated Freeboy files from Game Music Emu 0.6.1. (LMMS#3618)
b00efe5 
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
Reviewers

@zonkmachine zonkmachine zonkmachine approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@karmux @zonkmachine @tresf