[FCC-patch] keep the compiler happy

(cherry picked from commit 89c87959b9556f0c0158d0d491b6f048a04cebd7) (cherry picked from commit 9a2262fe2951ec4711467a710bc1a2547153e954)
BlackHole · Aug 10, 2023 · 0edf0c0 · 0edf0c0
1 parent 445ec7f
commit 0edf0c0
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 11 deletions.
diff --git a/lib/dvb/decoder.cpp b/lib/dvb/decoder.cpp
@@ -1551,7 +1551,6 @@ RESULT eTSMPEGDecoder::fccUpdatePids(int fe_id, int vpid, int vtype, int pcrpid)
 
 	if ((fe_id != m_fcc_feid) || (vpid != m_fcc_vpid) || (vtype != m_fcc_vtype) || (pcrpid != m_fcc_pcrpid))
 	{
-		int cur_fcc_state = m_fcc_state;
 		fccStop();
 		if (prepareFCC(fe_id, vpid, vtype, pcrpid))
 		{

diff --git a/lib/dvb/decoder.h b/lib/dvb/decoder.h
@@ -101,14 +101,6 @@ class eTSMPEGDecoder: public sigc::trackable, public iTSMPEGDecoder
 	ePtr<eDVBPCR> m_pcr;
 	ePtr<eDVBTText> m_text;
 	int m_vpid, m_vtype, m_apid, m_atype, m_pcrpid, m_textpid;
-	int m_fcc_fd;
-	bool m_fcc_enable;
-	int m_fcc_state;
-
-	int m_fcc_feid;
-	int m_fcc_vpid;
-	int m_fcc_vtype;
-	int m_fcc_pcrpid;
 	enum
 	{
 		changeVideo = 1,
@@ -130,6 +122,13 @@ class eTSMPEGDecoder: public sigc::trackable, public iTSMPEGDecoder
 	sigc::signal<void(struct videoEvent)> m_video_event;
 	int m_video_clip_fd;
 	ePtr<eTimer> m_showSinglePicTimer;
+	int m_fcc_fd;
+	bool m_fcc_enable;
+	int m_fcc_state;
+	int m_fcc_feid;
+	int m_fcc_vpid;
+	int m_fcc_vtype;
+	int m_fcc_pcrpid;
 	void finishShowSinglePic(); // called by timer
 public:
 	enum { pidNone = -1 };

diff --git a/lib/dvb/dvb.cpp b/lib/dvb/dvb.cpp
@@ -704,7 +704,7 @@ void eDVBResourceManager::setUsbTuner()
 			if ((res = sscanf(line.c_str(), "NIM Socket %d:", &fe_idx)) == 1)
 				continue;
 
-			if ((fe_idx != -1) && (line.find("\tName: ") == 0) && (line.find("VTUNER") != -1))
+			if ((fe_idx != -1) && (line.find("\tName: ") == 0) && (line.find("VTUNER") != std::string::npos))
 				usbtuner_idx[usbtuner_count++] = fe_idx;
 		}
 		in.close();

diff --git a/lib/service/servicedvb.h b/lib/service/servicedvb.h
@@ -209,8 +209,8 @@ class eDVBServicePlay: public eDVBServiceBase,
 	ePtr<eDVBService> m_dvb_service;
 
 	ePtr<iTSMPEGDecoder> m_decoder;
-	int m_decoder_index;
 	int m_is_primary;
+	int m_decoder_index;
 	int m_have_video_pid;
 	int m_tune_state;
 	bool m_noaudio;