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

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

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

Modified Files:
	dj.c 
Log Message:
Trying to fix corrupted playlist loading

Index: dj.c
===================================================================
RCS file: /cvsroot/openneo/openneo/apps/dj.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** dj.c	5 Dec 2004 18:25:14 -0000	1.9
--- dj.c	25 Jan 2005 02:30:00 -0000	1.10
***************
*** 87,94 ****
  #define DJ_COMMAND_FILE_VERSION 1
  #define PLAYLIST_STEP  128
- #define PLAYLIST_SHUFFLE_HISTORY_MAX  63
  #define DJ_QUEUE_DISPLAY_STEP 25
  #define DJ_PLAYLIST_QUEUE_DISPLAY_STEP 100
  #define DEFAULT_PLAYLIST_NAME "/dynamic.m3u"
  
  #define DJ_NOERROR               0
--- 87,94 ----
  #define DJ_COMMAND_FILE_VERSION 1
  #define PLAYLIST_STEP  128
  #define DJ_QUEUE_DISPLAY_STEP 25
  #define DJ_PLAYLIST_QUEUE_DISPLAY_STEP 100
  #define DEFAULT_PLAYLIST_NAME "/dynamic.m3u"
+ #define MAX_PLAYLIST_NAME_LENGTH 24
  
  #define DJ_NOERROR               0
***************
*** 117,121 ****
  
    int playing_index;
!   char name[20];           //Name of playlist
  };
  
--- 117,121 ----
  
    int playing_index;
!   char name[MAX_PLAYLIST_NAME_LENGTH];           //Name of playlist
  };
  
***************
*** 183,187 ****
  void dj_init(void)
  {
-   //The 3 variables must no be changed afterwards via dj_reset
    dj.enable_music = true;
    dj.status = 0;
--- 183,186 ----
***************
*** 436,440 ****
    int i;
    unsigned short* pNewArray;
! 
    if( dj.playlist.count == dj.playlist.max_count ){
      
--- 435,440 ----
    int i;
    unsigned short* pNewArray;
!     
!   //Check if we need to increase the Array size
    if( dj.playlist.count == dj.playlist.max_count ){
      
***************
*** 941,945 ****
    char* path_start = line;
    char* path_end;
!   struct dj_command_entry entry;
  
    (void)offset;
--- 941,945 ----
    char* path_start = line;
    char* path_end;
!   struct dj_command_entry entry = {0};
  
    (void)offset;
***************
*** 1433,1437 ****
    dj.fd = fopen( DJ_COMMAND_FILE, O_RDWR|O_CREAT );
    if( dj.fd < 0 ) {
!     msg_error("Opening command file");
      return;
    }
--- 1433,1437 ----
    dj.fd = fopen( DJ_COMMAND_FILE, O_RDWR|O_CREAT );
    if( dj.fd < 0 ) {
!     msg_error("Opening bookmark file");
      return;
    }
***************
*** 1450,1453 ****
--- 1450,1454 ----
      return -1;
  
+   fsync(dj.fd);
    lseek( dj.fd, 0, SEEK_SET );
  
***************
*** 1505,1509 ****
  	pstr = strrchr( g_read_entry.path, '/' );
  	if( pstr )
! 	  strcpy( dj.playlist.name, pstr+1 );
        }
  
--- 1506,1510 ----
  	pstr = strrchr( g_read_entry.path, '/' );
  	if( pstr )
! 	  strncpy( dj.playlist.name, pstr+1, MAX_PLAYLIST_NAME_LENGTH );
        }
  
***************
*** 1561,1564 ****
--- 1562,1566 ----
    int ret;
      
+   fsync(dj.fd);
    lseek( dj.fd, 0, SEEK_SET );