aboutsummaryrefslogtreecommitdiff
path: root/scene/gui/video_player.cpp
diff options
context:
space:
mode:
authorJuan Linietsky2017-01-15 16:06:14 -0300
committerJuan Linietsky2017-01-15 16:07:51 -0300
commitb400c69cd487f70d8164dd5550eb994253d359d6 (patch)
tree3ff9a43ef2fb12fa16bf0aca0f3f56fb7a1cf212 /scene/gui/video_player.cpp
parentb24b52d56bb3938bdeff9640b0730d7717f2b4c6 (diff)
downloadgodot-b400c69cd487f70d8164dd5550eb994253d359d6.tar.gz
godot-b400c69cd487f70d8164dd5550eb994253d359d6.tar.zst
godot-b400c69cd487f70d8164dd5550eb994253d359d6.zip
Diffstat (limited to 'scene/gui/video_player.cpp')
-rw-r--r--scene/gui/video_player.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/scene/gui/video_player.cpp b/scene/gui/video_player.cpp
index 4c177ea53..907b5a771 100644
--- a/scene/gui/video_player.cpp
+++ b/scene/gui/video_player.cpp
@@ -28,7 +28,7 @@
/*************************************************************************/
#include "video_player.h"
#include "os/os.h"
-
+/*
int VideoPlayer::InternalStream::get_channel_count() const {
@@ -46,7 +46,7 @@ void VideoPlayer::InternalStream::update(){
player->sp_update();
}
-
+*/
int VideoPlayer::sp_get_channel_count() const {
@@ -234,8 +234,8 @@ void VideoPlayer::play() {
playback->stop();
playback->play();
set_process_internal(true);
- AudioServer::get_singleton()->stream_set_active(stream_rid,true);
- AudioServer::get_singleton()->stream_set_volume_scale(stream_rid,volume);
+// AudioServer::get_singleton()->stream_set_active(stream_rid,true);
+// AudioServer::get_singleton()->stream_set_volume_scale(stream_rid,volume);
last_audio_time=0;
};
@@ -247,7 +247,7 @@ void VideoPlayer::stop() {
return;
playback->stop();
- AudioServer::get_singleton()->stream_set_active(stream_rid,false);
+// AudioServer::get_singleton()->stream_set_active(stream_rid,false);
resampler.flush();
set_process_internal(false);
last_audio_time=0;
@@ -416,16 +416,16 @@ VideoPlayer::VideoPlayer() {
buffering_ms=500;
server_mix_rate=44100;
- internal_stream.player=this;
- stream_rid=AudioServer::get_singleton()->audio_stream_create(&internal_stream);
+// internal_stream.player=this;
+// stream_rid=AudioServer::get_singleton()->audio_stream_create(&internal_stream);
last_audio_time=0;
};
VideoPlayer::~VideoPlayer() {
- if (stream_rid.is_valid())
- AudioServer::get_singleton()->free(stream_rid);
+// if (stream_rid.is_valid())
+// AudioServer::get_singleton()->free(stream_rid);
resampler.clear(); //Not necessary here, but make in consistent with other "stream_player" classes
};