summaryrefslogtreecommitdiff
path: root/scene/gui
diff options
context:
space:
mode:
Diffstat (limited to 'scene/gui')
-rw-r--r--scene/gui/video_player.cpp18
-rw-r--r--scene/gui/video_player.h6
2 files changed, 12 insertions, 12 deletions
diff --git a/scene/gui/video_player.cpp b/scene/gui/video_player.cpp
index 4c177ea53c..907b5a771f 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
};
diff --git a/scene/gui/video_player.h b/scene/gui/video_player.h
index 694cb253a4..168ea805b1 100644
--- a/scene/gui/video_player.h
+++ b/scene/gui/video_player.h
@@ -37,16 +37,16 @@ class VideoPlayer : public Control {
GDCLASS(VideoPlayer,Control);
- struct InternalStream : public AudioServer::AudioStream {
+/* struct InternalStream : public AudioServer::AudioStream {
VideoPlayer *player;
virtual int get_channel_count() const;
virtual void set_mix_rate(int p_rate); //notify the stream of the mix rate
virtual bool mix(int32_t *p_buffer,int p_frames);
virtual void update();
};
+*/
-
- InternalStream internal_stream;
+// InternalStream internal_stream;
Ref<VideoStreamPlayback> playback;
Ref<VideoStream> stream;