Update of /cvsroot/pyamp/pyamp/src
In directory sc8-pr-cvs1:/tmp/cvs-serv32691/src
Modified Files:
playlist.py songthread.py
Log Message:
Fixed the bahavior of repeat/target mode
Index: playlist.py
===================================================================
RCS file: /cvsroot/pyamp/pyamp/src/playlist.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** playlist.py 26 Sep 2003 04:51:32 -0000 1.5
--- playlist.py 29 Sep 2003 03:34:04 -0000 1.6
***************
*** 108,115 ****
self.setPaletteBackgroundPixmap(pixmap)
- def acceptDrag(self, event):
- #~ return self.acceptDrops() and self.itemsMovable() and event.source() == self
- return True
-
def customEvent(self, event):
# We get a next event from songThread when the current song has
--- 108,111 ----
***************
*** 117,125 ****
if event.type() == SongThread.NEXT_EVENT:
if self.isTarget():
! # replay the same song when in target mode
! self.setPlayingSong(self.getPlayingSong())
else:
self.next()
! self.songThread.play()
# We get a tick event from songThread once every second when it is
# playing
--- 113,127 ----
if event.type() == SongThread.NEXT_EVENT:
if self.isTarget():
! # replay the same song when in target and repeat mode
! if self.isRepeat():
! self.setPlayingSong(self.getPlayingSong())
! self.songThread.play()
! # target - repeat = single song playing mode
! else:
! self.stop()
else:
self.next()
! if self.isPlaying():
! self.songThread.play()
# We get a tick event from songThread once every second when it is
# playing
***************
*** 128,131 ****
--- 130,137 ----
self.emit(PYSIGNAL("ticked(int)"), (time,))
+ def acceptDrag(self, event):
+ #~ return self.acceptDrops() and self.itemsMovable() and event.source() == self
+ return True
+
def songDropped(self, event, item):
list = []
***************
*** 297,307 ****
self.getPlayingSong().setPlaying(False)
if song is None:
- self.setPlaying(False)
self.songThread.pause()
name = ""
length = 0
else:
- self.played.upush(song.getIndex())
song.setPlaying(True)
self.songThread.setSong(song.getFullpath())
name = song.getName()
--- 303,312 ----
self.getPlayingSong().setPlaying(False)
if song is None:
self.songThread.pause()
name = ""
length = 0
else:
song.setPlaying(True)
+ self.played.upush(song.getIndex())
self.songThread.setSong(song.getFullpath())
name = song.getName()
Index: songthread.py
===================================================================
RCS file: /cvsroot/pyamp/pyamp/src/songthread.py,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** songthread.py 10 Sep 2003 19:12:38 -0000 1.1.1.1
--- songthread.py 29 Sep 2003 03:34:04 -0000 1.2
***************
*** 51,60 ****
sleep(0.1)
self.dev.write(buf)
else:
event = QCustomEvent(self.NEXT_EVENT)
QApplication.postEvent(self.receiver, event)
self.stopped = True
! continue
! time = self.song.getCurrentTime()
if self.time != time:
self.time = time
--- 51,60 ----
sleep(0.1)
self.dev.write(buf)
+ time = self.song.getCurrentTime()
else:
event = QCustomEvent(self.NEXT_EVENT)
QApplication.postEvent(self.receiver, event)
self.stopped = True
! time = self.song.getLength()
if self.time != time:
self.time = time
|
