Merge branch 'master' of fraxinas@git.opendreambox.org:/git/enigma2

diff --combined RecordTimer.py
index d72197c,6075141..381720e
--- 1/RecordTimer.py
--- 2/RecordTimer.py
+++ b/RecordTimer.py
@@@ -1,6 -1,6 +1,6 @@@
  import time
  #from time import datetime
 -from Tools import Directories, Notifications
 +from Tools import Directories, Notifications, ASCIItranslit
  
  from Components.config import config
  import timer
@@@ -141,9 -141,6 +141,9 @@@ class RecordTimerEntry(timer.TimerEntry
                if self.name:
                        filename += " - " + self.name
  
 +              if config.recording.ascii_filenames.value:
 +                      filename = ASCIItranslit.legacyEncode(filename)
 +
                if self.dirname and not Directories.fileExists(self.dirname, 'w'):
                        self.dirnameHadToFallback = True
                        self.Filename = Directories.getRecordingFilename(filename, None)
@@@ -184,24 -181,12 +184,12 @@@
                                if event_id is None:
                                        event_id = -1
  
-                       prep_res=self.record_service.prepare(self.Filename + ".ts", self.begin, self.end, event_id)
+                       prep_res=self.record_service.prepare(self.Filename + ".ts", self.begin, self.end, event_id, self.name.replace("\n", ""), self.description.replace("\n", ""), ' '.join(self.tags))
                        if prep_res:
-                               self.log(2, "'prepare' failed: error %d" % prep_res)
-                               NavigationInstance.instance.stopRecordService(self.record_service)
-                               self.record_service = None
-                               return False
- 
-                       self.log(3, "prepare ok, writing meta information to %s" % self.Filename)
-                       try:
-                               f = open(self.Filename + ".ts.meta", "w")
-                               f.write(rec_ref.toString() + "\n")
-                               f.write(self.name.replace("\n", "") + "\n")
-                               f.write(self.description.replace("\n", "") + "\n")
-                               f.write(str(self.begin) + "\n")
-                               f.write(' '.join(self.tags))
-                               f.close()
-                       except IOError:
-                               self.log(4, "failed to write meta information")
+                               if prep_rest == 255:
+                                       self.log(4, "failed to write meta information")
+                               else:
+                                       self.log(2, "'prepare' failed: error %d" % prep_res)
                                NavigationInstance.instance.stopRecordService(self.record_service)
                                self.record_service = None
                                return False