light9 Changeset - 539de47b68cc

Changeset - 539de47b68cc

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Drew Perttula - 14 years ago 2011-06-20 20:18:34
drewp@bigasterisk.com

asco: fix the EOS catcher instead of the broken duration-.2 hack
Ignore-this: 76db6d1c0eea79e6db88f95984059105

2 files changed with 16 insertions and 8 deletions:

bin/ascoltami2

light9/ascoltami/player.py

0 comments (0 inline, 0 general)

bin/ascoltami2

➞

Show inline comments

@@ @@ -24,24 +24,26 @@ class App: @@
         # one seems to run
         thread.start_new(web.httpserver.runbasic,
                          (makeWebApp(self).wsgifunc(),
                           ('0.0.0.0', musicPort)))
         mainloop = gobject.MainLoop()
         mainloop.run()
     def onEOS(self, song):
         self.player.pause()
         self.player.seek(0)
         # stop here for now- no go-button behavior
         return
         try:
             nextSong = self.playlist.nextSong(song)
         except NoSuchSong: # we're at the end of the playlist
             return
         self.player.setSong(nextSong, play=False)
 if __name__ == "__main__":
     logging.basicConfig()
     log = logging.getLogger()
     gobject.threads_init()

light9/ascoltami/player.py

➞

Show inline comments

@@ @@ -23,50 +23,56 @@ class Player(object): @@
         self.autoStopTime = 0
         self.onEOS = onEOS
         # before playbin2:
         #self.pipeline = gst.parse_launch("filesrc name=file location=%s ! wavparse name=src ! audioconvert ! alsasink name=out" % songFile)
         gobject.timeout_add(50, self.watchTime)
         bus = self.pipeline.get_bus()
         bus.add_signal_watch()
         def on_any(bus, msg):
             print bus, msg
         #bus.connect('message', on_any)
             print bus, msg, msg.type
             if msg.type == gst.MESSAGE_EOS:
                 if self.onEOS is not None:
                     self.onEOS(self.getSong())
         bus.connect('message', on_any)
         def onStreamStatus(bus, message):
             print "streamstatus", bus, message
             (statusType, _elem) = message.parse_stream_status()
             if statusType == gst.STREAM_STATUS_TYPE_ENTER:
                 self.setupAutostop()
         bus.connect('message::stream-status', onStreamStatus)
     def watchTime(self):
         try:
             try:
                 t = self.currentTime()
             except gst.QueryError:
                 return True
             log.debug("watch %s < %s < %s",
                       self.lastWatchTime, self.autoStopTime, t)
             if self.lastWatchTime < self.autoStopTime < t:
                 log.info("autostop")
                 self.pause()
             if not self.onEOS:
                 if self.isPlaying() and t >= self.duration() - .2:
                     # i don't expect to hit dur exactly with this
                     # polling. What would be better would be to watch for
                     # the EOS signal and react to that
                     self.onEOS(self.getSong())
                 # new EOS logic above should be better
             ## if not self.onEOS:
             ##     if self.isPlaying() and t >= self.duration() - .2:
             ##         # i don't expect to hit dur exactly with this
             ##         # polling. What would be better would be to watch for
             ##         # the EOS signal and react to that
             ##         self.onEOS(self.getSong())
             self.lastWatchTime = t
         except:
             traceback.print_exc()
         return True
     def seek(self, t):
         assert self.playbin.seek_simple(
             gst.FORMAT_TIME,
             gst.SEEK_FLAG_FLUSH | gst.SEEK_FLAG_ACCURATE | gst.SEEK_FLAG_SKIP,
             t * gst.SECOND)
         self.playStartTime = time.time()

0 comments (0 inline, 0 general)