[Freevo-cvslog] freevo/src item.py,1.6,1.7 playlist.py,1.9,1.10 rc.py,1.7,1.8

[<kr...@us...>]

Update of /cvsroot/freevo/freevo/src
In directory sc8-pr-cvs1:/tmp/cvs-serv28060/src

Modified Files:
	item.py playlist.py rc.py 
Log Message:
Mathieu Weber's bugfix for multipart movies

Index: item.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/item.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** item.py	12 Feb 2003 06:33:21 -0000	1.6
--- item.py	24 Feb 2003 04:21:39 -0000	1.7
***************
*** 10,13 ****
--- 10,16 ----
  # -----------------------------------------------------------------------
  # $Log$
+ # Revision 1.7  2003/02/24 04:21:39  krister
+ # Mathieu Weber's bugfix for multipart movies
+ #
  # Revision 1.6  2003/02/12 06:33:21  krister
  # Cosmetic changes.
***************
*** 156,160 ****
  
          else:
!             if event == rc.PLAY_END:
                  menuwidget = menu.get_singleton()
                  menuwidget.refresh()
--- 159,163 ----
  
          else:
!             if event == rc.PLAY_END or event == rc.USER_END:
                  menuwidget = menu.get_singleton()
                  menuwidget.refresh()

Index: playlist.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/playlist.py,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** playlist.py	12 Jan 2003 17:57:52 -0000	1.9
--- playlist.py	24 Feb 2003 04:21:40 -0000	1.10
***************
*** 10,13 ****
--- 10,16 ----
  # -----------------------------------------------------------------------
  # $Log$
+ # Revision 1.10  2003/02/24 04:21:40  krister
+ # Mathieu Weber's bugfix for multipart movies
+ #
  # Revision 1.9  2003/01/12 17:57:52  dischi
  # Renamed SUFFIX_MPLAYER_FILES to SUFFIX_VIDEO_FILES because we also play
***************
*** 310,315 ****
  
      def eventhandler(self, event, menuw=None):
!         if (event == rc.DOWN or event == rc.PLAY_END) and self.current_item \
!            and self.playlist:
              pos = self.playlist.index(self.current_item)
              pos = (pos+1) % len(self.playlist)
--- 313,318 ----
  
      def eventhandler(self, event, menuw=None):
!         if (event == rc.DOWN or event == rc.PLAY_END or event == rc.USER_END) \
!            and self.current_item and self.playlist:
              pos = self.playlist.index(self.current_item)
              pos = (pos+1) % len(self.playlist)
***************
*** 323,327 ****
  
          # end and no next item
!         if event == rc.PLAY_END:
              self.current_item = None
              menuwidget = menu.get_singleton()
--- 326,330 ----
  
          # end and no next item
!         if event == rc.PLAY_END or event == rc.USER_END:
              self.current_item = None
              menuwidget = menu.get_singleton()

Index: rc.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/rc.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** rc.py	20 Feb 2003 18:31:02 -0000	1.7
--- rc.py	24 Feb 2003 04:21:40 -0000	1.8
***************
*** 10,13 ****
--- 10,16 ----
  # -----------------------------------------------------------------------
  # $Log$
+ # Revision 1.8  2003/02/24 04:21:40  krister
+ # Mathieu Weber's bugfix for multipart movies
+ #
  # Revision 1.7  2003/02/20 18:31:02  dischi
  # except on IOError if config.LIRCRC doesn't exists
***************
*** 157,160 ****
--- 160,164 ----
      # Application generated codes
      PLAY_END = 'PLAY_END'     # Reached end of song, movie, etc
+     USER_END = 'USER_END'     # User ended the song, etc
      IDENTIFY_MEDIA = 'IDENTIFY_MEDIA'
      REFRESH_SCREEN = 'REFRESH_SCREEN'