Skip to content

Updated to juce 7 #1

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Updated to juce 7 #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion sfzero/SF2Sound.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ SF2Sound::~SF2Sound()



SharedResourcesSF2* SF2Sound::sharedSamples()
SharedResourcesSF2::Ptr SF2Sound::sharedSamples()
{
if (sf2Samples_ == nullptr)
sf2Samples_ = SharedResources::getInstance()->sf2Resources(file_);
Expand Down
2 changes: 1 addition & 1 deletion sfzero/SF2Sound.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ namespace sfzero
explicit SF2Sound (const juce::File &fileIn, int channel);
virtual ~SF2Sound ();

SharedResourcesSF2* sharedSamples();
SharedResourcesSF2::Ptr sharedSamples();

void loadRegions() override;
void loadSamples(juce::AudioFormatManager *formatManager,
Expand Down
2 changes: 1 addition & 1 deletion sfzero/SFZCommon.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#ifndef SFZCOMMON_H_INCLUDED
#define SFZCOMMON_H_INCLUDED

#include "AppConfig.h"
//#include "AppConfig.h"

#include <juce_audio_basics/juce_audio_basics.h>
#include <juce_audio_formats/juce_audio_formats.h>
Expand Down
2 changes: 1 addition & 1 deletion sfzero/SFZSound.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ Sound::~Sound()
sfzSamples_ = nullptr;
}

SharedResourcesSFZ* Sound::sharedSamples()
SharedResourcesSFZ::Ptr Sound::sharedSamples()
{
if (sfzSamples_ == nullptr)
sfzSamples_ = SharedResources::getInstance()->sfzResources(file_);
Expand Down
2 changes: 1 addition & 1 deletion sfzero/SFZSound.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ namespace sfzero
explicit Sound (const juce::File &file, int channel);
virtual ~Sound ();

SharedResourcesSFZ* sharedSamples();
SharedResourcesSFZ::Ptr sharedSamples();

typedef juce::ReferenceCountedObjectPtr<Sound> Ptr;

Expand Down