Changeset 6957 for bell-scheduler/trunk/fuentes/n4d-bellscheduler.install/usr/share/n4d/python-plugins/BellSchedulerManager.py

Timestamp:

Mar 5, 2018, 9:40:43 AM (3 years ago)

Author:

jrpelegrina

Message:

Clean svn trash in code

File:

• bell-scheduler/trunk/fuentes/n4d-bellscheduler.install/usr/share/n4d/python-plugins/BellSchedulerManager.py (modified) (3 diffs)

bell-scheduler/trunk/fuentes/n4d-bellscheduler.install/usr/share/n4d/python-plugins/BellSchedulerManager.py

@@ -258 +258 @@
                 duration=info[item]["play"]["duration"]
 
-<<<<<<< .mine
+
                 if duration>0:
                         fade_out=int(duration)-2
@@ -266 +266 @@
                         fade_effects='-af aformat=channel_layouts=mono '
                         cmd="ffplay -nodisp -autoexit "
-||||||| .r6943
-                fade_out=int(duration)-2
-                fade_effects='-af afade=in:st=1:d=3,afade=out:st='+str(fade_out)+":d=2"
-                cmd="ffplay -nodisp -autoexit -t "+str(duration)
-=======
-                if duration>0:
-                        fade_out=int(duration)-2
-                        fade_effects='-af aformat=channel_layouts=mono -af afade=in:st=1:d=3,afade=out:st='+str(fade_out)+":d=2"
-                        cmd="ffplay -nodisp -autoexit -t "+str(duration)
-                else:
-                        fade_effects='-af aformat=channel_layouts=mono '        
->>>>>>> .r6950
 
                 if sound_option !="url":
@@ -291 +279 @@
                 info_to_cron["BellScheduler"][key]["cmd"]=cmd
                         
-                print("###################################INFO TO CRON#######################")
-                print(info_to_cron)
                 return info_to_cron