File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -3,17 +3,17 @@ use crate::Result;
33use std:: io:: Cursor ;
44
55use rodio:: mixer:: Mixer ;
6- use rodio:: stream :: { OutputStream , OutputStreamBuilder } ;
6+ use rodio:: { DeviceSinkBuilder , MixerDeviceSink } ;
77
88pub struct Sound {
9- _stream : OutputStream ,
9+ _stream : MixerDeviceSink ,
1010 mixer : Mixer ,
1111 cursor : Cursor < & ' static [ u8 ; 5943 ] > ,
1212}
1313
1414impl Sound {
1515 pub fn new ( ) -> Result < Self > {
16- let stream = OutputStreamBuilder :: open_default_stream ( ) ?;
16+ let stream = DeviceSinkBuilder :: open_default_sink ( ) ?;
1717 let mixer = stream. mixer ( ) . clone ( ) ;
1818 let contents = include_bytes ! ( "beep.ogg" ) ;
1919 Ok ( Sound {
@@ -27,9 +27,9 @@ impl Sound {
2727 pub fn play ( & self ) -> Result < ( ) > {
2828 let cursor = self . cursor . clone ( ) ;
2929 let decoder = rodio:: Decoder :: new ( cursor) ?;
30- let sink = rodio:: Sink :: connect_new ( & self . mixer ) ;
31- sink . append ( decoder) ;
32- sink . sleep_until_end ( ) ;
30+ let player = rodio:: Player :: connect_new ( & self . mixer ) ;
31+ player . append ( decoder) ;
32+ player . sleep_until_end ( ) ;
3333 Ok ( ( ) )
3434 }
3535}
You can’t perform that action at this time.
0 commit comments