X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/7c8c2b339b747763eede225a0ca554a405e5ac7b..855949a917ed8cf65397adc49872c99bdb2123c2:/lib/service/servicedvb.cpp

diff --git a/lib/service/servicedvb.cpp b/lib/service/servicedvb.cpp
index 254c12fd..238f838f 100644
--- a/lib/service/servicedvb.cpp
+++ b/lib/service/servicedvb.cpp
@@ -65,16 +65,7 @@ RESULT eStaticServiceDVBInformation::getName(const eServiceReference &ref, std::
 				if (!service_center->info(parent, service_info))
 				{
 					if (!service_info->getName(parent, name))
-					{
-						// just show short name
-						unsigned int pos = name.find("\xc2\x86");
-						if ( pos != std::string::npos )
-							name.erase(0, pos+2);
-						pos = name.find("\xc2\x87");
-						if ( pos != std::string::npos )
-							name.erase(pos);
-						name+=" - ";
-					}
+						name=buildShortName(name) + " - ";
 				}
 			}
 		}
@@ -730,6 +721,7 @@ RESULT eDVBServiceList::getContent(std::list<eServiceReference> &list, bool sort
 //   S = Service Reference (as python string object .. same as ref.toString())
 //   C = Service Reference (as python string object .. same as ref.toCompareString())
 //   N = Service Name (as python string object)
+//   n = Short Service Name (short name brakets used) (as python string object)
 //   when exactly one return value per service is selected in the format string,
 //   then each value is directly a list entry
 //   when more than one value is returned per service, then the list is a list of
@@ -750,7 +742,7 @@ PyObject *eDVBServiceList::getContent(const char* format, bool sorted)
 		ePtr<iStaticServiceInformation> sptr;
 		eServiceCenterPtr service_center;
 
-		if (strchr(format, 'N'))
+		if (strchr(format, 'N') || strchr(format, 'n'))
 			eServiceCenter::getPrivInstance(service_center);
 
 		ret = PyList_New(services);
@@ -782,6 +774,30 @@ PyObject *eDVBServiceList::getContent(const char* format, bool sorted)
 						{
 							std::string name;
 							sptr->getName(ref, name);
+
+							// filter short name brakets
+							unsigned int pos;
+							while((pos = name.find("\xc2\x86")) != std::string::npos)
+								name.erase(pos,2);
+							while((pos = name.find("\xc2\x87")) != std::string::npos)
+								name.erase(pos,2);
+
+							if (name.length())
+								tmp = PyString_FromString(name.c_str());
+						}
+					}
+					if (!tmp)
+						tmp = PyString_FromString("<n/a>");
+					break;
+				case 'n':  // short service name
+					if (service_center)
+					{
+						service_center->info(ref, sptr);
+						if (sptr)
+						{
+							std::string name;
+							sptr->getName(ref, name);
+							name = buildShortName(name);
 							if (name.length())
 								tmp = PyString_FromString(name.c_str());
 						}
@@ -1108,8 +1124,8 @@ RESULT eDVBServicePlay::start()
 		   to start recording from the data demux. */
 	if (m_is_pvr)
 		m_cue = new eCueSheet();
-
-	m_event(this, evStart);
+	else
+		m_event(this, evStart);
 
 	m_first_program_info = 1;
 	eServiceReferenceDVB &service = (eServiceReferenceDVB&)m_reference;
@@ -1131,7 +1147,10 @@ RESULT eDVBServicePlay::start()
 	}
 
 	if (m_is_pvr)
+	{
 		loadCuesheet();
+		m_event(this, evStart);
+	}
 
 	m_event((iPlayableService*)this, evSeekableStatusChanged);
 	return 0;
@@ -1174,7 +1193,7 @@ RESULT eDVBServicePlay::stop()
 		if (!::stat(m_reference.path.c_str(), &s))
 			saveCuesheet();
 	}
-	
+	m_event((iPlayableService*)this, evStopped);
 	return 0;
 }
 
@@ -1867,7 +1886,7 @@ RESULT eDVBServicePlay::stopTimeshift()
 	
 	close(m_timeshift_fd);
 	eDebug("remove timeshift file");
-	remove(m_timeshift_file.c_str());
+	eBackgroundFileEraser::getInstance()->erase(m_timeshift_file.c_str());
 	
 	return 0;
 }
@@ -1982,6 +2001,11 @@ void eDVBServicePlay::updateTimeshiftPids()
 			i != program.audioStreams.end(); ++i)
 				pids_to_record.insert(i->pid);
 
+		for (std::vector<eDVBServicePMTHandler::subtitleStream>::const_iterator
+			i(program.subtitleStreams.begin());
+			i != program.subtitleStreams.end(); ++i)
+				pids_to_record.insert(i->pid);
+
 		std::set<int> new_pids, obsolete_pids;
 		
 		std::set_difference(pids_to_record.begin(), pids_to_record.end(), 
@@ -2016,6 +2040,7 @@ void eDVBServicePlay::switchToLive()
 	m_new_dvb_subtitle_page_connection = 0;
 	m_new_subtitle_page_connection = 0;
 	m_radiotext_updated_connection = 0;
+	m_video_event_connection = 0;
 
 		/* free the timeshift service handler, we need the resources */
 	m_service_handler_timeshift.free();
@@ -2039,17 +2064,18 @@ void eDVBServicePlay::switchToTimeshift()
 	m_new_subtitle_page_connection = 0;
 	m_new_dvb_subtitle_page_connection = 0;
 	m_radiotext_updated_connection = 0;
+	m_video_event_connection = 0;
 
 	m_timeshift_active = 1;
 
-	m_event((iPlayableService*)this, evSeekableStatusChanged);
-
 	eServiceReferenceDVB r = (eServiceReferenceDVB&)m_reference;
 	r.path = m_timeshift_file;
 
 	m_cue = new eCueSheet();
 	m_service_handler_timeshift.tune(r, 1, m_cue); /* use the decoder demux for everything */
 	updateDecoder(); /* mainly to switch off PCR */
+
+	m_event((iPlayableService*)this, evSeekableStatusChanged);
 }
 
 void eDVBServicePlay::updateDecoder()
@@ -2702,7 +2728,6 @@ void eDVBServicePlay::setPCMDelay(int delay)
 
 void eDVBServicePlay::video_event(struct iTSMPEGDecoder::videoEvent event)
 {
-	eDebug("!!!!!!!!!! Video Event type %d, aspect %d, %dx%d", event.type, event.aspect, event.width, event.height);
 	memcpy(&m_videoEventData, &event, sizeof(iTSMPEGDecoder::videoEvent));
 	m_event((iPlayableService*)this, evVideoSizeChanged);
 }