Move streaming code to common.

uglyoldbob · Jan 31, 2024 · 0aeb090 · 0aeb090
1 parent f27a84c
commit 0aeb090
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 476 deletions.
diff --git a/common/src/lib.rs b/common/src/lib.rs
@@ -7,6 +7,7 @@ pub mod recording;
 pub mod rom_status;
 pub mod romlist;
 pub mod storage;
+pub mod streaming;
 pub mod video;
 
 /// The types of errors that can occur when loading a rom

diff --git a/nes/rust/src/network/streaming.rs → common/src/streaming.rs b/nes/rust/src/network/streaming.rs → common/src/streaming.rs
@@ -4,7 +4,7 @@ use gstreamer::prelude::{
     Cast, ElementExt, ElementExtManual, GstBinExtManual, GstObjectExt, PadExt,
 };
 
-use common_emulator::audio::AudioProducerWithRate;
+use crate::audio::AudioProducerWithRate;
 
 /// The main struct for sending a video stream over an arbitrary stream
 pub struct StreamingOut {

diff --git a/nes/rust/src/network/emulator/mod.rs b/nes/rust/src/network/emulator/mod.rs
@@ -20,10 +20,9 @@ use libp2p::{
 use crate::controller::ButtonCombination;
 use common_emulator::audio::AudioProducerWithRate;
 
-use super::{
-    streaming::{StreamingIn, StreamingOut},
-    NodeRole,
-};
+use super::NodeRole;
+
+use common_emulator::streaming::{StreamingIn, StreamingOut};
 
 /// Represents a message that can be sent to and from other nodes in the network.
 #[derive(Debug, serde::Deserialize, serde::Serialize)]

diff --git a/nes/rust/src/network/mod.rs b/nes/rust/src/network/mod.rs
@@ -1,7 +1,6 @@
 //! This is the module for network play related code.
 
 mod emulator;
-mod streaming;
 
 use std::collections::HashSet;
 
@@ -12,7 +11,7 @@ use libp2p::{futures::StreamExt, Multiaddr, Swarm};
 use crate::controller::ButtonCombination;
 use common_emulator::audio::AudioProducerWithRate;
 
-use self::streaming::StreamingIn;
+use common_emulator::streaming::StreamingIn;
 
 #[derive(PartialEq, Copy, Clone, Debug, serde::Deserialize, serde::Serialize)]
 /// The roles that a node on the network can have

diff --git a/snes/rust/src/network/emulator/mod.rs b/snes/rust/src/network/emulator/mod.rs
@@ -20,10 +20,8 @@ use libp2p::{
 use crate::controller::ButtonCombination;
 use common_emulator::audio::AudioProducerWithRate;
 
-use super::{
-    streaming::{StreamingIn, StreamingOut},
-    NodeRole,
-};
+use super::NodeRole;
+use common_emulator::streaming::{StreamingIn, StreamingOut};
 
 /// Represents a message that can be sent to and from other nodes in the network.
 #[derive(Debug, serde::Deserialize, serde::Serialize)]

diff --git a/snes/rust/src/network/mod.rs b/snes/rust/src/network/mod.rs
@@ -1,7 +1,6 @@
 //! This is the module for network play related code.
 
 mod emulator;
-mod streaming;
 
 use std::collections::HashSet;
 
@@ -12,7 +11,7 @@ use libp2p::{futures::StreamExt, Multiaddr, Swarm};
 use crate::controller::ButtonCombination;
 use common_emulator::audio::AudioProducerWithRate;
 
-use self::streaming::StreamingIn;
+use common_emulator::streaming::StreamingIn;
 
 #[derive(PartialEq, Copy, Clone, Debug, serde::Deserialize, serde::Serialize)]
 /// The roles that a node on the network can have