[OpenNeo-CVS] openneo/apps dj.c,1.8,1.9

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

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

Modified Files:
	dj.c 
Log Message:
Minor code cleanup

Index: dj.c
===================================================================
RCS file: /cvsroot/openneo/openneo/apps/dj.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** dj.c	10 Nov 2004 00:41:46 -0000	1.8
--- dj.c	5 Dec 2004 18:25:14 -0000	1.9
***************
*** 163,167 ****
  int do_clear_playlist(struct do_params* params)
  {
!   int button;
  
    if( dj_is_playing() == DJ_TYPE_PLAYLIST) {
--- 163,167 ----
  int do_clear_playlist(struct do_params* params)
  {
!   int ret;
  
    if( dj_is_playing() == DJ_TYPE_PLAYLIST) {
***************
*** 169,174 ****
      if( (params->flags & FLAGS_VERBAL_MASK ) == FLAGS_VERBAL_ASK ) {
  
!       button = msg_box( MSG_YESNO_SIMPLE, "Clear Playlist?" );
!       if( button != BUTTON_PLAY )
  	return FLAGS_REDRAW_ALL;
      }
--- 169,174 ----
      if( (params->flags & FLAGS_VERBAL_MASK ) == FLAGS_VERBAL_ASK ) {
  
!       ret = msg_box( MSG_YESCANCEL, "Clear Playlist?" );
!       if( ret != MSGR_YES )
  	return FLAGS_REDRAW_ALL;
      }
***************
*** 255,259 ****
    dj.current = NULL;
    dj.next = NULL;
!   
    saved_state.type = 0;
    saved_state.status = 0;
--- 255,259 ----
    dj.current = NULL;
    dj.next = NULL;
! 
    saved_state.type = 0;
    saved_state.status = 0;
***************
*** 492,501 ****
  }
  
- /*
-   The mpeg Driver can preloed up to 8 tracks
-   so there could be a case were we need to shuffle for the next 8 tracks to come
- 
- */
- 
  int dj_get_next_index( int steps )
  {
--- 492,495 ----
***************
*** 533,547 ****
        
      case REPEAT_ALL:
!       
!       if( index >=0 && index < dj.playlist.count )
! 	return index;
        else {
! 	
! 	index = index % dj.playlist.count;
! 	
! 	while(index < 0)
! 	  index += dj.playlist.count;
! 	
! 	return index;
        }
      }
--- 527,546 ----
        
      case REPEAT_ALL:
! 
!       if( dj.playlist.count == 1 )
! 	return dj.playlist.playing_index;
        else {
! 
! 	if( index >=0 && index < dj.playlist.count )
! 	  return index;
! 	else {
! 	  
! 	  index = index % dj.playlist.count;
! 	  
! 	  while(index < 0)
! 	    index += dj.playlist.count;
! 	  
! 	  return index;
! 	}
        }
      }
***************
*** 1646,1650 ****
    if( (params->flags & FLAGS_VERBAL_MASK) == FLAGS_VERBAL_ASK )
      if( kbd_input(&filename[1], sizeof(filename)-1) <= 0 )
!       return 0;
   
    dj_save_playlist(filename);
--- 1645,1649 ----
    if( (params->flags & FLAGS_VERBAL_MASK) == FLAGS_VERBAL_ASK )
      if( kbd_input(&filename[1], sizeof(filename)-1) <= 0 )
!       return FLAGS_REDRAW_ALL;
   
    dj_save_playlist(filename);