chore: Move buffer code from core to ruffle_common

Author: Lord-McSweeney

Cargo.lock

@@ -17,5 +17,6 @@ gc-arena = { workspace = true }
 ruffle_macros = { path = "../macros" }
 ruffle_wstr = { path = "../../wstr" }
 swf = { path = "../../swf" }
+thiserror = { workspace = true }
 tracing = { workspace = true }
 url = { workspace = true }

core/common/Cargo.toml

@@ -1,5 +1,6 @@
-//! Types used across Ruffle
+//! Methods and types used across Ruffle
 
 pub mod avm_string;
+pub mod buffer;
 pub mod sandbox;
 pub mod utils;

core/src/buffer.rs renamed to core/common/src/buffer.rs

@@ -3,12 +3,12 @@ use std::any::Any;
 use crate::{
     avm1::{NativeObject, Object as Avm1Object},
     avm2::{Avm2, EventObject as Avm2EventObject, SoundChannelObject},
-    buffer::Substream,
     context::UpdateContext,
     display_object::{self, DisplayObject, MovieClip, TDisplayObject},
     string::AvmString,
 };
 use gc_arena::Collect;
+pub use ruffle_common::buffer::Substream;
 use slotmap::{new_key_type, Key, SlotMap};
 
 #[cfg(feature = "audio")]

core/common/src/lib.rs

@@ -17,8 +17,8 @@ pub use nellymoser::NellymoserDecoder;
 pub use pcm::PcmDecoder;
 
 use crate::backend::audio::{SoundStreamInfo, SoundStreamWrapping};
-use crate::buffer::{Slice, Substream, SubstreamChunksIter};
 use crate::tag_utils::{ControlFlow, SwfSlice};
+use ruffle_common::buffer::{Slice, Substream, SubstreamChunksIter};
 use std::io::{Cursor, Read};
 use swf::{AudioCompression, SoundFormat, TagCode};
 use thiserror::Error;

core/src/backend/audio.rs

@@ -1,6 +1,6 @@
 use super::{Decoder, SeekableDecoder, SoundStreamInfo, Substream, SubstreamTagReader};
-use crate::buffer::SliceCursor;
 use bitstream_io::{BigEndian, BitRead, BitReader};
+use ruffle_common::buffer::SliceCursor;
 use std::io::{Cursor, Read};
 use swf::SoundFormat;
 use thiserror::Error;

core/src/backend/audio/decoders.rs

@@ -1,8 +1,8 @@
 use super::decoders::{self, AdpcmDecoder, Decoder, PcmDecoder, SeekableDecoder};
 use super::{SoundHandle, SoundInstanceHandle, SoundStreamInfo, SoundTransform};
 use crate::backend::audio::{DecodeError, RegisterError};
-use crate::buffer::Substream;
 use crate::tag_utils::SwfSlice;
+use ruffle_common::buffer::Substream;
 use slotmap::SlotMap;
 use std::io::Cursor;
 use std::sync::{Arc, Mutex, RwLock};
@@ -1099,7 +1099,7 @@ macro_rules! impl_audio_mixer_backend {
         #[inline]
         fn start_substream(
             &mut self,
-            stream_data: ruffle_core::buffer::Substream,
+            stream_data: ruffle_core::backend::audio::Substream,
             stream_info: &SoundStreamInfo,
         ) -> Result<SoundInstanceHandle, DecodeError> {
             self.$mixer.start_substream(stream_data, stream_info)

core/src/backend/audio/decoders/adpcm.rs

@@ -18,7 +18,6 @@ mod avm2;
 mod avm_rng;
 mod binary_data;
 pub mod bitmap;
-pub mod buffer;
 mod character;
 pub mod context;
 pub mod context_menu;

core/src/backend/audio/mixer.rs

@@ -14,7 +14,6 @@ use crate::backend::audio::{
     DecodeError, SoundInstanceHandle, SoundStreamInfo, SoundStreamWrapping,
 };
 use crate::backend::navigator::Request;
-use crate::buffer::{Buffer, Slice, Substream, SubstreamError};
 use crate::context::UpdateContext;
 use crate::display_object::{MovieClip, TDisplayObject};
 use crate::loader::Error;
@@ -28,6 +27,7 @@ use flv_rs::{
 };
 use gc_arena::barrier::unlock;
 use gc_arena::{Collect, DynamicRoot, Gc, Lock, Mutation, Rootable};
+use ruffle_common::buffer::{Buffer, Slice, Substream, SubstreamError};
 use ruffle_macros::istr;
 use ruffle_render::bitmap::BitmapInfo;
 use ruffle_video::frame::EncodedFrame;