3 files changed, 10 insertions, 12 deletions
diff --git a/scene/gui/popup_menu.cpp b/scene/gui/popup_menu.cpp
index d7987d4a19..cf01ce8643 100644
--- a/scene/gui/popup_menu.cpp
+++ b/scene/gui/popup_menu.cpp
@@ -305,11 +305,15 @@ void PopupMenu::_gui_input(const Ref<InputEvent> &p_event) {
 
 			case BUTTON_WHEEL_DOWN: {
 
-				_scroll(-b->get_factor(), b->get_position());
+				if (get_global_position().y + get_size().y > get_viewport_rect().size.y) {
+					_scroll(-b->get_factor(), b->get_position());
+				}
 			} break;
 			case BUTTON_WHEEL_UP: {
 
-				_scroll(b->get_factor(), b->get_position());
+				if (get_global_position().y < 0) {
+					_scroll(b->get_factor(), b->get_position());
+				}
 			} break;
 			case BUTTON_LEFT: {
 
@@ -380,7 +384,9 @@ void PopupMenu::_gui_input(const Ref<InputEvent> &p_event) {
 
 	Ref<InputEventPanGesture> pan_gesture = p_event;
 	if (pan_gesture.is_valid()) {
-		_scroll(-pan_gesture->get_delta().y, pan_gesture->get_position());
+		if (get_global_position().y + get_size().y > get_viewport_rect().size.y || get_global_position().y < 0) {
+			_scroll(-pan_gesture->get_delta().y, pan_gesture->get_position());
+		}
 	}
 }
 
diff --git a/scene/gui/video_player.cpp b/scene/gui/video_player.cpp
index 953ebe84f6..b0739a2f37 100644
--- a/scene/gui/video_player.cpp
+++ b/scene/gui/video_player.cpp
@@ -38,11 +38,6 @@ int VideoPlayer::sp_get_channel_count() const {
 	return playback->get_channels();
 }
 
-void VideoPlayer::sp_set_mix_rate(int p_rate) {
-
-	server_mix_rate = p_rate;
-}
-
 bool VideoPlayer::mix(AudioFrame *p_buffer, int p_frames) {
 
 	// Check the amount resampler can really handle.
@@ -241,7 +236,7 @@ void VideoPlayer::set_stream(const Ref<VideoStream> &p_stream) {
 
 		AudioServer::get_singleton()->lock();
 		if (channels > 0)
-			resampler.setup(channels, playback->get_mix_rate(), server_mix_rate, buffering_ms, 0);
+			resampler.setup(channels, playback->get_mix_rate(), AudioServer::get_singleton()->get_mix_rate(), buffering_ms, 0);
 		else
 			resampler.clear();
 		AudioServer::get_singleton()->unlock();
@@ -494,7 +489,6 @@ VideoPlayer::VideoPlayer() {
 	bus_index = 0;
 
 	buffering_ms = 500;
-	server_mix_rate = 44100;
 
 	//	internal_stream.player=this;
 	//	stream_rid=AudioServer::get_singleton()->audio_stream_create(&internal_stream);
diff --git a/scene/gui/video_player.h b/scene/gui/video_player.h
index 7010c71ad9..5c379b5620 100644
--- a/scene/gui/video_player.h
+++ b/scene/gui/video_player.h
@@ -50,7 +50,6 @@ class VideoPlayer : public Control {
 	Ref<VideoStream> stream;
 
 	int sp_get_channel_count() const;
-	void sp_set_mix_rate(int p_rate); //notify the stream of the mix rate
 	bool mix(AudioFrame *p_buffer, int p_frames);
 
 	RID stream_rid;
@@ -69,7 +68,6 @@ class VideoPlayer : public Control {
 	bool expand;
 	bool loops;
 	int buffering_ms;
-	int server_mix_rate;
 	int audio_track;
 	int bus_index;