gnokii/gnokii gnokii.c,1.365,1.366

[BORBELY Zoltan <address@hidden>]

Update of /cvsroot/gnokii/gnokii/gnokii
In directory subversions:/tmp/cvs-serv28077/gnokii

Modified Files:
        gnokii.c 
Log Message:
ringtone handling updates


Index: gnokii.c
===================================================================
RCS file: /cvsroot/gnokii/gnokii/gnokii/gnokii.c,v
retrieving revision 1.365
retrieving revision 1.366
diff -C2 -d -r1.365 -r1.366
*** gnokii.c    23 Oct 2003 00:35:02 -0000      1.365
--- gnokii.c    24 Oct 2003 12:49:05 -0000      1.366
***************
*** 160,164 ****
        OPT_GETNETWORKINFO,
        OPT_GETLOCKSINFO,
!       OPT_GETRINGTONELIST
  } opt_index;
  
--- 160,165 ----
        OPT_GETNETWORKINFO,
        OPT_GETLOCKSINFO,
!       OPT_GETRINGTONELIST,
!       OPT_DELETERINGTONE
  } opt_index;
  
***************
*** 316,319 ****
--- 317,321 ----
                     "          gnokii --ringtoneconvert source destination\n"
                     "          gnokii --getringtonelist\n"
+                    "          gnokii --deleteringtone start [end]\n"
                     "          gnokii --reset [soft|hard]\n"
                     "          gnokii --getprofile [start_number [end_number]] 
[-r|--raw]\n"
***************
*** 4096,4100 ****
        gn_error error;
        unsigned char buff[512];
!       int i;
  
        bool raw = false;
--- 4098,4102 ----
        gn_error error;
        unsigned char buff[512];
!       int i, location;
  
        bool raw = false;
***************
*** 4137,4141 ****
        }
  
!       ringtone.location = (argc > optind + 1) ? atoi(argv[optind + 1]) : -1;
  
        if (raw) {
--- 4139,4143 ----
        }
  
!       location = (argc > optind + 1) ? atoi(argv[optind + 1]) : -1;
  
        if (raw) {
***************
*** 4148,4151 ****
--- 4150,4154 ----
                rawdata.length = fread(rawdata.data, 1, rawdata.length, f);
                fclose(f);
+               ringtone.location = location;
                if (*name)
                        snprintf(ringtone.name, sizeof(ringtone.name), "%s", 
name);
***************
*** 4158,4161 ****
--- 4161,4165 ----
                        return error;
                }
+               ringtone.location = location;
                if (*name) snprintf(ringtone.name, sizeof(ringtone.name), "%s", 
name);
                error = gn_sm_functions(GN_OP_SetRingtone, &data, &state);
***************
*** 4302,4305 ****
--- 4306,4344 ----
  }
  
+ static gn_error deleteringtone(int argc, char *argv[])
+ {
+       gn_ringtone ringtone;
+       gn_error error;
+       int i, start, end;
+ 
+       memset(&ringtone, 0, sizeof(ringtone));
+       gn_data_clear(&data);
+       data.ringtone = &ringtone;
+ 
+       switch (argc) {
+       case 1:
+               start = atoi(argv[0]);
+               end = start;
+               break;
+       case 2:
+               start = atoi(argv[0]);
+               end = atoi(argv[1]);
+               break;
+       default:
+               usage(stderr, -1);
+               return -1;
+       }
+ 
+       for (i = start; i <= end; i++) {
+               ringtone.location = i;
+               if ((error = gn_sm_functions(GN_OP_DeleteRingtone, &data, 
&state)) == GN_ERR_NONE)
+                       printf(_("Ringtone %d deleted\n"), i);
+               else
+                       printf(_("Failed to delete ringtone %d: %s\n"), i, 
gn_error_print(error));
+       }
+ 
+       return GN_ERR_NONE;
+ }
+ 
  static int presskey(void)
  {
***************
*** 4844,4847 ****
--- 4883,4889 ----
                { "getringtonelist",    no_argument,       NULL, 
OPT_GETRINGTONELIST },
  
+               /* Delete ringtones */
+               { "deleteringtone",     required_argument, NULL, 
OPT_DELETERINGTONE },
+ 
                /* Get SMS center number mode */
                { "getsmsc",            optional_argument, NULL, OPT_GETSMSC },
***************
*** 4978,4981 ****
--- 5020,5024 ----
                { OPT_PLAYRINGTONE,      1, 3, 0 },
                { OPT_RINGTONECONVERT,   2, 2, 0 },
+               { OPT_DELETERINGTONE,    1, 2, 0 },
                { OPT_RESET,             0, 1, 0 },
                { OPT_GETPROFILE,        0, 3, 0 },
***************
*** 5187,5190 ****
--- 5230,5236 ----
                case OPT_GETRINGTONELIST:
                        rc = getringtonelist();
+                       break;
+               case OPT_DELETERINGTONE:
+                       rc = deleteringtone(nargc, nargv);
                        break;
                case OPT_RINGTONECONVERT: