Skip to content

Commit c9c4e2e

Browse files
fmalitaSkia Commit-Bot
authored andcommitted
Componentize SkAudioPlayer
Relocate under modules/audioplayer and package as a standalone component. Change-Id: If9dc72bb0abe170049a514c9931186703a3c138a Reviewed-on: https://skia-review.googlesource.com/c/skia/+/310058 Commit-Queue: Florin Malita <[email protected]> Reviewed-by: Mike Reed <[email protected]>
1 parent 48bdf6d commit c9c4e2e

File tree

9 files changed

+28
-12
lines changed

9 files changed

+28
-12
lines changed

BUILD.gn

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -459,7 +459,6 @@ optional("fontmgr_mac_ct") {
459459
# AppKit symbols NSFontWeightXXX may be dlsym'ed.
460460
"AppKit.framework",
461461
"ApplicationServices.framework",
462-
"AVFoundation.framework",
463462
]
464463
}
465464

@@ -2505,7 +2504,6 @@ if (skia_enable_tools) {
25052504
test_app("viewer") {
25062505
is_shared_library = is_android
25072506
sources = [
2508-
"src/ports/SkAudioPlayer.cpp",
25092507
"tools/viewer/AnimTimer.h",
25102508
"tools/viewer/BisectSlide.cpp",
25112509
"tools/viewer/GMSlide.cpp",
@@ -2539,6 +2537,7 @@ if (skia_enable_tools) {
25392537
":tool_utils",
25402538
":trace",
25412539
"experimental/skrive",
2540+
"modules/audioplayer",
25422541
"modules/particles",
25432542
"modules/skottie",
25442543
"modules/skottie:utils",
@@ -2558,11 +2557,6 @@ if (skia_enable_tools) {
25582557
"//third_party/spirv-tools:spvtools_val",
25592558
]
25602559
}
2561-
if (is_mac) {
2562-
sources += [ "src/ports/SkAudioPlayer_mac.mm" ]
2563-
} else {
2564-
sources += [ "src/ports/SkAudioPlayer_none.cpp" ]
2565-
}
25662560
}
25672561
}
25682562

modules/audioplayer/BUILD.gn

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
# Copyright 2020 Google Inc.
2+
#
3+
# Use of this source code is governed by a BSD-style license that can be
4+
# found in the LICENSE file.
5+
6+
import("../../gn/skia.gni")
7+
8+
component("audioplayer") {
9+
public = [ "SkAudioPlayer.h" ]
10+
sources = [ "SkAudioPlayer.cpp" ]
11+
deps = [ "../..:skia" ]
12+
13+
if (is_mac) {
14+
sources += [ "SkAudioPlayer_mac.mm" ]
15+
frameworks = [ "AVFoundation.framework" ]
16+
} else {
17+
sources += [ "SkAudioPlayer_none.cpp" ]
18+
}
19+
}

src/ports/SkAudioPlayer.cpp renamed to modules/audioplayer/SkAudioPlayer.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* found in the LICENSE file.
66
*/
77

8-
#include "include/ports/SkAudioPlayer.h"
8+
#include "modules/audioplayer/SkAudioPlayer.h"
99
#include <algorithm>
1010
#include <cmath>
1111

File renamed without changes.

src/ports/SkAudioPlayer_mac.mm renamed to modules/audioplayer/SkAudioPlayer_mac.mm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*/
77

88
#include "include/core/SkData.h"
9-
#include "include/ports/SkAudioPlayer.h"
9+
#include "modules/audioplayer/SkAudioPlayer.h"
1010

1111
#if defined(SK_BUILD_FOR_MAC) || defined(SK_BUILD_FOR_IOS)
1212

src/ports/SkAudioPlayer_none.cpp renamed to modules/audioplayer/SkAudioPlayer_none.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*/
77

88
#include "include/core/SkData.h"
9-
#include "include/ports/SkAudioPlayer.h"
9+
#include "modules/audioplayer/SkAudioPlayer.h"
1010

1111
std::unique_ptr<SkAudioPlayer> SkAudioPlayer::Make(sk_sp<SkData> src) {
1212
return nullptr;

modules/skottie/src/layers/AudioLayer.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,9 @@ sk_sp<sksg::RenderNode> AnimationBuilder::attachAudioLayer(const skjson::ObjectV
7070
layer_info->fInPoint,
7171
layer_info->fOutPoint,
7272
fFrameRate));
73+
} else {
74+
this->log(Logger::Level::kWarning, nullptr,
75+
"Could not load audio asset '%s'.", name->begin());
7376
}
7477
}
7578
}

samplecode/SampleAudio.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
#include "include/core/SkCanvas.h"
99
#include "include/core/SkData.h"
10-
#include "include/ports/SkAudioPlayer.h"
10+
#include "modules/audioplayer/SkAudioPlayer.h"
1111
#include "samplecode/Sample.h"
1212
#include "src/core/SkUtils.h"
1313
#include "tools/Resources.h"

tools/viewer/SkottieSlide.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#include "include/core/SkCanvas.h"
1313
#include "include/core/SkFont.h"
1414
#include "include/core/SkTime.h"
15-
#include "include/ports/SkAudioPlayer.h"
15+
#include "modules/audioplayer/SkAudioPlayer.h"
1616
#include "modules/skottie/include/Skottie.h"
1717
#include "modules/skottie/utils/SkottieUtils.h"
1818
#include "modules/skresources/include/SkResources.h"

0 commit comments

Comments
 (0)