[OpenNeo-CVS] openneo/apps player.c,1.11,1.12 dj.h,1.5,1.6 dj.c,1.12,1.13

[Francois B <mrs...@us...>]

Update of /cvsroot/openneo/openneo/apps
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30255

Modified Files:
	player.c dj.h dj.c 
Log Message:
Mpeg flag change

Index: dj.h
===================================================================
RCS file: /cvsroot/openneo/openneo/apps/dj.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** dj.h	10 Nov 2004 00:41:46 -0000	1.5
--- dj.h	26 Jun 2005 21:49:51 -0000	1.6
***************
*** 24,29 ****
  
  #define DJ_STATUS_STOPPED     0
! #define DJ_STATUS_PLAYING     MPEG_STATUS_PLAY
! #define DJ_STATUS_PAUSED      MPEG_STATUS_PAUSE
  
  struct dj_command_entry
--- 24,29 ----
  
  #define DJ_STATUS_STOPPED     0
! #define DJ_STATUS_PLAYING     MPEG_STATUS_PLAYING
! #define DJ_STATUS_PAUSED      MPEG_STATUS_PAUSED
  
  struct dj_command_entry

Index: player.c
===================================================================
RCS file: /cvsroot/openneo/openneo/apps/player.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** player.c	23 May 2005 14:19:39 -0000	1.11
--- player.c	26 Jun 2005 21:49:51 -0000	1.12
***************
*** 159,163 ****
    bool exit = false;
  
!   bool paused = (mpeg_status() & MPEG_STATUS_PAUSE );
    
    struct mp3entry* id3 = dj_get_current();
--- 159,163 ----
    bool exit = false;
  
!   bool paused = (mpeg_status() & MPEG_STATUS_PAUSED );
    
    struct mp3entry* id3 = dj_get_current();
***************
*** 185,189 ****
        else
  	{
! 	  if ( (mpeg_status() & MPEG_STATUS_PLAY) &&
  	       id3 && id3->mpeg.length )
  	    {
--- 185,189 ----
        else
  	{
! 	  if ( (mpeg_status() & MPEG_STATUS_PLAYING) &&
  	       id3 && id3->mpeg.length )
  	    {
***************
*** 273,277 ****
      bool exit = false;
  
!     bool paused = (mpeg_status() & MPEG_STATUS_PAUSE );
  
      struct mp3entry* id3 = dj_get_current();
--- 273,277 ----
      bool exit = false;
  
!     bool paused = (mpeg_status() & MPEG_STATUS_PAUSED );
  
      struct mp3entry* id3 = dj_get_current();
***************
*** 299,303 ****
                  else
                  {
!                     if ( (mpeg_status() & MPEG_STATUS_PLAY) &&
                            id3 && id3->mpeg.length )
                      {
--- 299,303 ----
                  else
                  {
!                     if ( (mpeg_status() & MPEG_STATUS_PLAYING) &&
                            id3 && id3->mpeg.length )
                      {
***************
*** 420,424 ****
  
        //Restart track
!       paused = mpeg_status() & MPEG_STATUS_PAUSE;
  
        if( !paused )
--- 420,424 ----
  
        //Restart track
!       paused = mpeg_status() & MPEG_STATUS_PAUSED;
  
        if( !paused )

Index: dj.c
===================================================================
RCS file: /cvsroot/openneo/openneo/apps/dj.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** dj.c	30 Apr 2005 19:14:06 -0000	1.12
--- dj.c	26 Jun 2005 21:49:51 -0000	1.13
***************
*** 1254,1259 ****
      dj.current = mpeg_current_track();
      if( dj.current ) {
!       global_settings.resume_offset = dj.current->offset;
!       global_settings.resume_elapsed = dj.current->elapsed;
      }
      settings_save( false );
--- 1254,1259 ----
      dj.current = mpeg_current_track();
      if( dj.current ) {
! 	global_settings.resume_offset = dj.current->offset;
! 	global_settings.resume_elapsed = dj.current->elapsed;
      }
      settings_save( false );