From 1e4f4861742695c01d10b9f4b56dacbd8bdd80c5 Mon Sep 17 00:00:00 2001 From: Hajime Hoshi Date: Thu, 11 Feb 2016 17:22:02 +0900 Subject: [PATCH] audio: Move files from internal/audio to exp/audio --- exp/audio/audio.go | 4 +--- {internal => exp}/audio/audio_js.go | 0 {internal => exp}/audio/audio_openal.go | 0 {internal => exp}/audio/audio_windows.go | 0 internal/audio/audio.go | 23 ----------------------- 5 files changed, 1 insertion(+), 26 deletions(-) rename {internal => exp}/audio/audio_js.go (100%) rename {internal => exp}/audio/audio_openal.go (100%) rename {internal => exp}/audio/audio_windows.go (100%) delete mode 100644 internal/audio/audio.go diff --git a/exp/audio/audio.go b/exp/audio/audio.go index 9becf0bfa..c93cfcfaf 100644 --- a/exp/audio/audio.go +++ b/exp/audio/audio.go @@ -16,8 +16,6 @@ package audio import ( "io" - - "github.com/hajimehoshi/ebiten/internal/audio" ) type Player struct { @@ -41,5 +39,5 @@ func NewPlayer(src io.ReadSeeker, sampleRate int) *Player { } func (p *Player) Play() error { - return audio.Play(p.src, p.sampleRate) + return play(p.src, p.sampleRate) } diff --git a/internal/audio/audio_js.go b/exp/audio/audio_js.go similarity index 100% rename from internal/audio/audio_js.go rename to exp/audio/audio_js.go diff --git a/internal/audio/audio_openal.go b/exp/audio/audio_openal.go similarity index 100% rename from internal/audio/audio_openal.go rename to exp/audio/audio_openal.go diff --git a/internal/audio/audio_windows.go b/exp/audio/audio_windows.go similarity index 100% rename from internal/audio/audio_windows.go rename to exp/audio/audio_windows.go diff --git a/internal/audio/audio.go b/internal/audio/audio.go deleted file mode 100644 index a4f53ada6..000000000 --- a/internal/audio/audio.go +++ /dev/null @@ -1,23 +0,0 @@ -// Copyright 2015 Hajime Hoshi -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package audio - -import ( - "io" -) - -func Play(src io.ReadSeeker, sampleRate int) error { - return play(src, sampleRate) -}