Skip to content

Commit 8e4b3f9

Browse files
authored
[file_packager] Remove unused audio handling code. NFC (#24979)
The audio plugin stuff was moved/removed in a97aab0.
1 parent 6841391 commit 8e4b3f9

File tree

1 file changed

+4
-15
lines changed

1 file changed

+4
-15
lines changed

tools/file_packager.py

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -91,12 +91,6 @@
9191

9292
DEBUG = os.environ.get('EMCC_DEBUG')
9393

94-
IMAGE_SUFFIXES = ('.jpg', '.png', '.bmp')
95-
AUDIO_SUFFIXES = ('.ogg', '.wav', '.mp3')
96-
AUDIO_MIMETYPES = {'ogg': 'audio/ogg', 'wav': 'audio/wav', 'mp3': 'audio/mpeg'}
97-
98-
DDS_HEADER_SIZE = 128
99-
10094
# Set to 1 to randomize file order and add some padding,
10195
# to work around silly av false positives
10296
AV_WORKAROUND = 0
@@ -726,10 +720,9 @@ def generate_js(data_target, data_files, metadata):
726720
# a similar API to XHRs
727721
code += '''
728722
/** @constructor */
729-
function DataRequest(start, end, audio) {
723+
function DataRequest(start, end) {
730724
this.start = start;
731725
this.end = end;
732-
this.audio = audio;
733726
}
734727
DataRequest.prototype = {
735728
requests: {},
@@ -752,7 +745,7 @@ def generate_js(data_target, data_files, metadata):
752745
753746
var files = metadata['files'];
754747
for (var i = 0; i < files.length; ++i) {
755-
new DataRequest(files[i]['start'], files[i]['end'], files[i]['audio'] || 0).open('GET', files[i]['filename']);
748+
new DataRequest(files[i]['start'], files[i]['end']).open('GET', files[i]['filename']);
756749
}\n''' % finish_handler
757750

758751
if options.has_embedded and not options.obj_output:
@@ -779,15 +772,11 @@ def generate_js(data_target, data_files, metadata):
779772
% (dirname, basename, counter))
780773
elif file_.mode == 'preload':
781774
# Preload
782-
metadata_el = {
775+
metadata['files'].append({
783776
'filename': file_.dstpath,
784777
'start': file_.data_start,
785778
'end': file_.data_end,
786-
}
787-
if filename[-4:] in AUDIO_SUFFIXES:
788-
metadata_el['audio'] = 1
789-
790-
metadata['files'].append(metadata_el)
779+
})
791780
else:
792781
assert 0
793782

0 commit comments

Comments
 (0)