liangsheng8708
/
ruffle
mirror of https://mirror.ghproxy.com/https://github.com/ruffle-rs/ruffle.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

avm2: Use `Gc` instead of `GcCell` in `SoundChannelObject`

This commit is contained in:
Lord-McSweeney 2024-07-31 10:21:54 -07:00 committed by Lord-McSweeney
parent 458264a76a
commit 5ea9b5d80b
2 changed files with 42 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/avm2/object.rs
View File

@ -1393,7 +1393,7 @@ impl<'gc> Object<'gc> {
Self::ClassObject(o) => WeakObject::ClassObject(ClassObjectWeak(Gc::downgrade(o.0))),
Self::VectorObject(o) => WeakObject::VectorObject(VectorObjectWeak(Gc::downgrade(o.0))),
Self::SoundObject(o) => WeakObject::SoundObject(SoundObjectWeak(Gc::downgrade(o.0))),
Self::SoundChannelObject(o) => WeakObject::SoundChannelObject(SoundChannelObjectWeak(GcCell::downgrade(o.0))),
Self::SoundChannelObject(o) => WeakObject::SoundChannelObject(SoundChannelObjectWeak(Gc::downgrade(o.0))),
Self::BitmapDataObject(o) => WeakObject::BitmapDataObject(BitmapDataObjectWeak(Gc::downgrade(o.0))),
Self::DateObject(o) => WeakObject::DateObject(DateObjectWeak(Gc::downgrade(o.0))),
Self::DictionaryObject(o) => WeakObject::DictionaryObject(DictionaryObjectWeak(Gc::downgrade(o.0))),

81
core/src/avm2/object/soundchannel_object.rs
View File

@ -9,25 +9,26 @@ use crate::backend::audio::SoundInstanceHandle;
use crate::context::UpdateContext;
use crate::display_object::SoundTransform;
use core::fmt;
use gc_arena::{Collect, GcCell, GcWeakCell, Mutation};
use std::cell::{Ref, RefMut};
use gc_arena::barrier::unlock;
use gc_arena::{lock::RefLock, Collect, Gc, GcWeak, Mutation};
use std::cell::{Cell, Ref, RefCell, RefMut};
/// A class instance allocator that allocates SoundChannel objects.
pub fn sound_channel_allocator<'gc>(
class: ClassObject<'gc>,
activation: &mut Activation<'_, 'gc>,
) -> Result<Object<'gc>, Error<'gc>> {
let base = ScriptObjectData::new(class);
let base = ScriptObjectData::new(class).into();
Ok(SoundChannelObject(GcCell::new(
Ok(SoundChannelObject(Gc::new(
activation.context.gc_context,
SoundChannelObjectData {
base,
sound_channel_data: SoundChannelData::NotLoaded {
sound_channel_data: RefCell::new(SoundChannelData::NotLoaded {
sound_transform: None,
should_stop: false,
},
position: 0.0,
}),
position: Cell::new(0.0),
},
))
.into())
@ -35,16 +36,16 @@ pub fn sound_channel_allocator<'gc>(
#[derive(Clone, Collect, Copy)]
#[collect(no_drop)]
pub struct SoundChannelObject<'gc>(pub GcCell<'gc, SoundChannelObjectData<'gc>>);
pub struct SoundChannelObject<'gc>(pub Gc<'gc, SoundChannelObjectData<'gc>>);
#[derive(Clone, Collect, Copy, Debug)]
#[collect(no_drop)]
pub struct SoundChannelObjectWeak<'gc>(pub GcWeakCell<'gc, SoundChannelObjectData<'gc>>);
pub struct SoundChannelObjectWeak<'gc>(pub GcWeak<'gc, SoundChannelObjectData<'gc>>);
impl fmt::Debug for SoundChannelObject<'_> {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
f.debug_struct("SoundChannelObject")
.field("ptr", &self.0.as_ptr())
.field("ptr", &Gc::as_ptr(self.0))
.finish()
}
}
@ -53,14 +54,13 @@ impl fmt::Debug for SoundChannelObject<'_> {
#[collect(no_drop)]
pub struct SoundChannelObjectData<'gc> {
/// Base script object
base: ScriptObjectData<'gc>,
base: RefLock<ScriptObjectData<'gc>>,
/// The sound this object holds.
#[collect(require_static)]
sound_channel_data: SoundChannelData,
sound_channel_data: RefCell<SoundChannelData>,
/// Position of the last playing sound in milliseconds.
position: f64,
position: Cell<f64>,
}
pub enum SoundChannelData {
@ -77,17 +77,17 @@ impl<'gc> SoundChannelObject<'gc> {
/// Convert a bare sound instance into it's object representation.
pub fn empty(activation: &mut Activation<'_, 'gc>) -> Result<Self, Error<'gc>> {
let class = activation.avm2().classes().soundchannel;
let base = ScriptObjectData::new(class);
let base = ScriptObjectData::new(class).into();
let sound_object = SoundChannelObject(GcCell::new(
let sound_object = SoundChannelObject(Gc::new(
activation.context.gc_context,
SoundChannelObjectData {
base,
sound_channel_data: SoundChannelData::NotLoaded {
sound_channel_data: RefCell::new(SoundChannelData::NotLoaded {
sound_transform: None,
should_stop: false,
},
position: 0.0,
}),
position: Cell::new(0.0),
},
));
sound_object.install_instance_slots(activation.context.gc_context);
@ -101,18 +101,19 @@ impl<'gc> SoundChannelObject<'gc> {
pub fn position(self, context: &mut UpdateContext<'_, 'gc>) -> f64 {
// The position is cached on read. This means that if the position isn't read until after
// the sound has played, the position will be 0 (#9952).
let mut write = self.0.write(context.gc_context);
if let SoundChannelData::Loaded { sound_instance } = write.sound_channel_data {
if let Some(pos) = context.audio.get_sound_position(sound_instance) {
write.position = pos;
let sound_channel_data = self.0.sound_channel_data.borrow();
if let SoundChannelData::Loaded { sound_instance } = &*sound_channel_data {
if let Some(pos) = context.audio.get_sound_position(*sound_instance) {
self.0.position.set(pos);
}
}
write.position
self.0.position.get()
}
pub fn instance(self) -> Option<SoundInstanceHandle> {
match &self.0.read().sound_channel_data {
let sound_channel_data = self.0.sound_channel_data.borrow();
match &*sound_channel_data {
SoundChannelData::NotLoaded { .. } => None,
SoundChannelData::Loaded { sound_instance } => Some(*sound_instance),
}
@ -123,8 +124,8 @@ impl<'gc> SoundChannelObject<'gc> {
activation: &mut Activation<'_, 'gc>,
instance: SoundInstanceHandle,
) {
let mut this = self.0.write(activation.context.gc_context);
match &mut this.sound_channel_data {
let mut sound_channel_data = self.0.sound_channel_data.borrow_mut();
match &mut *sound_channel_data {
SoundChannelData::NotLoaded {
sound_transform,
should_stop,
@ -138,7 +139,7 @@ impl<'gc> SoundChannelObject<'gc> {
if *should_stop {
activation.context.stop_sound(instance);
}
this.sound_channel_data = SoundChannelData::Loaded {
*sound_channel_data = SoundChannelData::Loaded {
sound_instance: instance,
}
}
@ -151,8 +152,8 @@ impl<'gc> SoundChannelObject<'gc> {
}
pub fn sound_transform(self, activation: &mut Activation<'_, 'gc>) -> Option<SoundTransform> {
let this = self.0.read();
match &this.sound_channel_data {
let sound_channel_data = self.0.sound_channel_data.borrow();
match &*sound_channel_data {
SoundChannelData::NotLoaded {
sound_transform, ..
} => sound_transform.clone(),
@ -168,8 +169,8 @@ impl<'gc> SoundChannelObject<'gc> {
activation: &mut Activation<'_, 'gc>,
new_sound_transform: SoundTransform,
) {
let mut this = self.0.write(activation.context.gc_context);
match &mut this.sound_channel_data {
let mut sound_channel_data = self.0.sound_channel_data.borrow_mut();
match &mut *sound_channel_data {
SoundChannelData::NotLoaded {
sound_transform, ..
} => {
@ -184,8 +185,8 @@ impl<'gc> SoundChannelObject<'gc> {
}
pub fn stop(self, activation: &mut Activation<'_, 'gc>) {
let mut this = self.0.write(activation.context.gc_context);
match &mut this.sound_channel_data {
let mut sound_channel_data = self.0.sound_channel_data.borrow_mut();
match &mut *sound_channel_data {
SoundChannelData::NotLoaded {
sound_transform: _,
should_stop,
@ -201,21 +202,21 @@ impl<'gc> SoundChannelObject<'gc> {
impl<'gc> TObject<'gc> for SoundChannelObject<'gc> {
fn base(&self) -> Ref<ScriptObjectData<'gc>> {
Ref::map(self.0.read(), |read| &read.base)
self.0.base.borrow()
}
fn base_mut(&self, mc: &Mutation<'gc>) -> RefMut<ScriptObjectData<'gc>> {
RefMut::map(self.0.write(mc), |write| &mut write.base)
unlock!(Gc::write(mc, self.0), SoundChannelObjectData, base).borrow_mut()
}
fn as_ptr(&self) -> *const ObjectPtr {
Gc::as_ptr(self.0) as *const ObjectPtr
}
fn value_of(&self, _mc: &Mutation<'gc>) -> Result<Value<'gc>, Error<'gc>> {
Ok(Object::from(*self).into())
}
fn as_ptr(&self) -> *const ObjectPtr {
self.0.as_ptr() as *const ObjectPtr
}
fn as_sound_channel(self) -> Option<SoundChannelObject<'gc>> {
Some(self)
}