[OpenNeo-CVS] openneo/apps mark.h,1.2,1.3 mark.c,1.3,1.4

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

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

Modified Files:
	mark.h mark.c 
Log Message:
language file used for m3u paths and error message added 

Index: mark.c
===================================================================
RCS file: /cvsroot/openneo/openneo/apps/mark.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** mark.c	21 Oct 2004 02:02:26 -0000	1.3
--- mark.c	10 Nov 2004 00:41:08 -0000	1.4
***************
*** 21,25 ****
--- 21,31 ----
  #include "gui.h"
  #include "dj.h"
+ #include "lang.h"
   
+ #define MARK_FAVORITES_LIST  0
+ #define MARK_TAGGED_LIST     1
+ 
+ static int mark_file( char *path, int list, bool verbal );
+ 
  int do_add_favorites_playing_file( struct do_params *params )
  {
***************
*** 27,34 ****
  
    if( id3 )
!     mark_file( id3->path, MARK_FAVORITES_LIST, (params->flags & FLAGS_VERBAL_MASK)?true:false);
! 
!   if( params->flags & FLAGS_VERBAL_MASK)
!     return FLAGS_REDRAW_ALL;
  
   return 0;
--- 33,37 ----
  
    if( id3 )
!     return mark_file( id3->path, MARK_FAVORITES_LIST, (params->flags & FLAGS_VERBAL_MASK)?true:false);
  
   return 0;
***************
*** 40,69 ****
  
    if( id3 )
!     mark_file( id3->path, MARK_TAGGED_LIST, (params->flags & FLAGS_VERBAL_MASK)?true:false);
! 
!   if( params->flags & FLAGS_VERBAL_MASK)
!     return FLAGS_REDRAW_ALL;
  
!  return 0;
  }
  
! void mark_file( char *path, int list, bool verbal )
  {
    int fd = -1;
    int count;
    char buffer[MAX_PATH+1];
    bool found = false;
  
    switch( list ) {
    case MARK_FAVORITES_LIST:
!     fd = fopen( "/Favorites.m3u", O_RDWR|O_CREAT );
      break;
    case MARK_TAGGED_LIST:
!     fd = fopen( "/Tagged.m3u", O_RDWR|O_CREAT );
      break;
    }
! 
!   if( fd < 0 )
!     return;
  
    if( filesize(fd) == 0 ) {
--- 43,74 ----
  
    if( id3 )
!     return mark_file( id3->path, MARK_TAGGED_LIST, (params->flags & FLAGS_VERBAL_MASK)?true:false);
  
!   return 0;
  }
  
! int mark_file( char *path, int list, bool verbal )
  {
+   int ret = 0;
    int fd = -1;
    int count;
    char buffer[MAX_PATH+1];
    bool found = false;
+   const unsigned char* m3u_path = 0;
  
    switch( list ) {
    case MARK_FAVORITES_LIST:
!     m3u_path = str(LANG_PATH_FAVORITES_M3U);
      break;
    case MARK_TAGGED_LIST:
!     m3u_path = str(LANG_PATH_TAGGED_M3U);
      break;
    }
!   
!   fd = fopen( m3u_path, O_RDWR|O_CREAT );
!   if( fd < 0 ) {
!     msg_error( "Opening %s", m3u_path );
!     return FLAGS_REDRAW_ALL;
!   }
  
    if( filesize(fd) == 0 ) {
***************
*** 90,96 ****
    }
  
!   if( verbal )
!     msg_splash( HZ, MSG_CENTER|MSG_VCENTER, "Track Added" );
!   
    fclose( fd );
  }
--- 95,104 ----
    }
  
!   if( verbal ) {
!     msg_splash( HZ, MSG_CENTER|MSG_VCENTER, str(LANG_TRACK_ADDED) );
!     ret = FLAGS_REDRAW_ALL;
!   }
! 
    fclose( fd );
+   return ret;
  }

Index: mark.h
===================================================================
RCS file: /cvsroot/openneo/openneo/apps/mark.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** mark.h	21 Oct 2004 02:02:26 -0000	1.2
--- mark.h	10 Nov 2004 00:41:06 -0000	1.3
***************
*** 16,23 ****
  #include "navigate.h"
  
- #define MARK_FAVORITES_LIST  0
- #define MARK_TAGGED_LIST     1
- 
- void mark_file( char *path, int list, bool verbal );
  int do_add_favorites_playing_file( struct do_params *params );
  int do_add_tagged_playing_file( struct do_params *params );
--- 16,19 ----