mirror of
https://github.com/tuxbox-neutrino/neutrino.git
synced 2025-08-30 17:01:15 +02:00
gui/movieplayer.cpp: fix for 6fe70ff17d
, audio tracks not cleared
This commit is contained in:
@@ -191,6 +191,12 @@ int CMoviePlayerGui::exec(CMenuTarget * parent, const std::string & actionKey)
|
|||||||
|
|
||||||
Cleanup();
|
Cleanup();
|
||||||
|
|
||||||
|
isMovieBrowser = false;
|
||||||
|
isBookmark = false;
|
||||||
|
timeshift = 0;
|
||||||
|
isHTTP = false;
|
||||||
|
isUPNP = false;
|
||||||
|
|
||||||
if (actionKey == "tsmoviebrowser") {
|
if (actionKey == "tsmoviebrowser") {
|
||||||
isMovieBrowser = true;
|
isMovieBrowser = true;
|
||||||
moviebrowser->setMode(MB_SHOW_RECORDS);
|
moviebrowser->setMode(MB_SHOW_RECORDS);
|
||||||
@@ -218,7 +224,6 @@ int CMoviePlayerGui::exec(CMenuTarget * parent, const std::string & actionKey)
|
|||||||
#endif
|
#endif
|
||||||
else if (actionKey == "upnp") {
|
else if (actionKey == "upnp") {
|
||||||
isUPNP = true;
|
isUPNP = true;
|
||||||
p_movie_info = NULL;
|
|
||||||
is_file_player = 1;
|
is_file_player = 1;
|
||||||
PlayFile();
|
PlayFile();
|
||||||
}
|
}
|
||||||
@@ -327,11 +332,6 @@ void CMoviePlayerGui::Cleanup()
|
|||||||
numsubs = 0;
|
numsubs = 0;
|
||||||
|
|
||||||
startposition = 0;
|
startposition = 0;
|
||||||
isMovieBrowser = false;
|
|
||||||
isBookmark = false;
|
|
||||||
timeshift = 0;
|
|
||||||
isHTTP = false;
|
|
||||||
isUPNP = false;
|
|
||||||
is_file_player = false;
|
is_file_player = false;
|
||||||
p_movie_info = NULL;
|
p_movie_info = NULL;
|
||||||
}
|
}
|
||||||
@@ -341,6 +341,7 @@ bool CMoviePlayerGui::SelectFile()
|
|||||||
bool ret = false;
|
bool ret = false;
|
||||||
menu_ret = menu_return::RETURN_REPAINT;
|
menu_ret = menu_return::RETURN_REPAINT;
|
||||||
|
|
||||||
|
Cleanup();
|
||||||
file_name = "";
|
file_name = "";
|
||||||
full_name = "";
|
full_name = "";
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user