diff --git a/src/gui/Makefile.am b/src/gui/Makefile.am
index e74370166..201cadef8 100644
--- a/src/gui/Makefile.am
+++ b/src/gui/Makefile.am
@@ -116,13 +116,13 @@ libneutrino_gui_a_SOURCES = \
 	xmltv_setup.cpp \
 	zapit_setup.cpp
 
-#if BOXTYPE_ARMBOX
-#libneutrino_gui_a_SOURCES += \
-#	streaminfo2.cpp
-#else
+if BOXTYPE_COOL
 libneutrino_gui_a_SOURCES += \
 	streaminfo1.cpp
-#endif
+else
+libneutrino_gui_a_SOURCES += \
+	streaminfo2.cpp
+endif
 
 if ENABLE_EXTUPDATE
 libneutrino_gui_a_SOURCES += \
diff --git a/src/gui/info_menue.cpp b/src/gui/info_menue.cpp
index b836a8da3..787e96b5c 100644
--- a/src/gui/info_menue.cpp
+++ b/src/gui/info_menue.cpp
@@ -39,9 +39,11 @@
 #include <gui/info_menue.h>
 #include <gui/imageinfo_ni.h> //NI
 #include <gui/dboxinfo.h>
+#if HAVE_COOL_HARDWARE
 #include <gui/streaminfo1.h>
-//#include <gui/streaminfo2.h>
-
+#else
+#include <gui/streaminfo2.h>
+#endif
 #if 0
 #include <gui/buildinfo.h>
 #endif
diff --git a/src/gui/movieplayer.cpp b/src/gui/movieplayer.cpp
index 5d566d4fe..fd9a4088c 100644
--- a/src/gui/movieplayer.cpp
+++ b/src/gui/movieplayer.cpp
@@ -2756,6 +2756,24 @@ void CMoviePlayerGui::selectChapter()
 	}
 }
 
+std::string CMoviePlayerGui::getAPIDDesc(unsigned int i)
+{
+	std::string apidtitle;
+	if (i < numpida)
+		getAudioName(apids[i], apidtitle);
+	if (apidtitle == "")
+		apidtitle = "Stream " + to_string(i);
+	return apidtitle;
+}
+
+unsigned int CMoviePlayerGui::getAPID(void)
+{
+	for (unsigned int i = 0; i < numpida; i++)
+		if (apids[i] == currentapid)
+			return i;
+	return -1;
+}
+
 void CMoviePlayerGui::selectSubtitle()
 {
 	if (!is_file_player)
diff --git a/src/gui/movieplayer.h b/src/gui/movieplayer.h
index 040d1f433..575c91ae4 100644
--- a/src/gui/movieplayer.h
+++ b/src/gui/movieplayer.h
@@ -261,6 +261,8 @@ class CMoviePlayerGui : public CMenuTarget
 	void setLastMode(int m) { m_LastMode = m; }
 	void Pause(bool b = true);
 	void selectAudioPid(void);
+	unsigned int getAPID(void);
+	std::string getAPIDDesc(unsigned int i);
 	bool SetPosition(int pos, bool absolute = false);
 	void selectSubtitle();
 	void showSubtitle(neutrino_msg_data_t data);
diff --git a/src/gui/user_menue.cpp b/src/gui/user_menue.cpp
index d6212609a..6a54de3eb 100644
--- a/src/gui/user_menue.cpp
+++ b/src/gui/user_menue.cpp
@@ -49,8 +49,11 @@
 #include "subchannel_select.h"
 #include "favorites.h"
 #include "audio_select.h"
+#if HAVE_COOL_HARDWARE
 #include "streaminfo1.h"
-//#include "streaminfo2.h"
+#else
+#include "streaminfo2.h"
+#endif
 #include "epgplus.h"
 #include "epgview.h"
 #include "eventlist.h"