gnokii/gnokii gnokii-app.h,1.36,1.37 gnokii.c,1.364,1.365

[BORBELY Zoltan <address@hidden>]

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

Modified Files:
        gnokii-app.h gnokii.c 
Log Message:
ringtone handling unified


Index: gnokii-app.h
===================================================================
RCS file: /cvsroot/gnokii/gnokii/gnokii/gnokii-app.h,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** gnokii-app.h        7 Sep 2003 22:01:58 -0000       1.36
--- gnokii-app.h        23 Oct 2003 00:35:02 -0000      1.37
***************
*** 29,115 ****
  */
  
- /* Nokia ringtones codes. */
- 
- char *RingingTones[] = {
- /*  0 */ "Unknown",
- /*  1 */ "Unknown",                 /* FIXME: probably not set. */
- /*  2 */ "Unknown",
- /*  3 */ "Unknown",
- /*  4 */ "Unknown",
- /*  5 */ "Unknown",
- /*  6 */ "Unknown",
- /*  7 */ "Unknown",
- /*  8 */ "Unknown",
- /*  9 */ "Unknown",
- /* 10 */ "Unknown",                 /* FIXME: probably pre set. */
- /* 11 */ "Unknown",
- /* 12 */ "Unknown",
- /* 13 */ "Unknown",
- /* 14 */ "Unknown",
- /* 15 */ "Unknown",
- /* 16 */ "Unknown",
- /* 17 */ "Uploaded",
- /* 18 */ "Ring ring",
- /* 19 */ "Low",
- /* 20 */ "Fly",
- /* 21 */ "Mosquito",
- /* 22 */ "Bee",
- /* 23 */ "Intro",
- /* 24 */ "Etude",
- /* 25 */ "Hunt",
- /* 26 */ "Going up",
- /* 27 */ "City Bird",
- /* 28 */ "Unknown",
- /* 29 */ "Unknown",
- /* 30 */ "Chase",
- /* 31 */ "Unknown",
- /* 32 */ "Scifi",
- /* 33 */ "Unknown",
- /* 34 */ "Kick",
- /* 35 */ "Do-mi-so",
- /* 36 */ "Robo N1X",
- /* 37 */ "Dizzy",
- /* 38 */ "Unknown",
- /* 39 */ "Playground",
- /* 40 */ "Unknown",
- /* 41 */ "Unknown",
- /* 42 */ "Unknown",
- /* 43 */ "That's it!",
- /* 44 */ "Unknown",
- /* 45 */ "Unknown",
- /* 46 */ "Unknown",
- /* 47 */ "Grande valse",   /* FIXME: Knock knock (Knock again). */
- /* 48 */ "Helan",          /* FIXME: Grand valse on 5110. */
- /* 49 */ "Fuga",           /* FIXME: Helan on 5110. */
- /* 50 */ "Menuet",         /* FIXME: Fuga on 5110. */
- /* 51 */ "Ode to Joy",
- /* 52 */ "Elise",
- /* 53 */ "Mozart 40",
- /* 54 */ "Piano Concerto", /* FIXME: Mozart 40 on 5110. */
- /* 55 */ "William Tell",
- /* 56 */ "Badinerie",      /* FIXME: William Tell on 5110. */
- /* 57 */ "Polka",          /* FIXME: Badinerie on 5110. */
- /* 58 */ "Attraction",     /* FIXME: Polka on 5110. */
- /* 59 */ "Unknown",        /* FIXME: Attraction on 5110. */
- /* 60 */ "Polite",         /* FIXME: Down on 5110. */
- /* 61 */ "Persuasion",
- /* 62 */ "Unknown",        /* FIXME: Persuasion on 5110. */
- /* 63 */ "Unknown",
- /* 64 */ "Unknown",
- /* 65 */ "Unknown",
- /* 66 */ "Unknown",
- /* 67 */ "Tick tick",
- /* 68 */ "Samba",
- /* 69 */ "Unknown",        /* FIXME: Samba on 5110. */
- /* 70 */ "Orient",
- /* 71 */ "Charleston",     /* FIXME: Orient on 5110. */
- /* 72 */ "Unknown",        /* FIXME: Charleston on 5110. */
- /* 73 */ "Jumping",        /* FIXME: Songette on 5110. */
- /* 74 */ "Unknown",        /* FIXME: Jumping on 5110. */
- /* 75 */ "Unknown",        /* FIXME: Lamb (Marry) on 5110. */
- /* 76 */ "Unknown",
- /* 77 */ "Unknown",
- /* 78 */ "Unknown",
- /* 79 */ "Unknown",
- /* 80 */ "Unknown"         /* FIXME: Tango (Tangoed) on 5110. */
- };
--- 29,30 ----

Index: gnokii.c
===================================================================
RCS file: /cvsroot/gnokii/gnokii/gnokii/gnokii.c,v
retrieving revision 1.364
retrieving revision 1.365
diff -C2 -d -r1.364 -r1.365
*** gnokii.c    19 Oct 2003 21:17:54 -0000      1.364
--- gnokii.c    23 Oct 2003 00:35:02 -0000      1.365
***************
*** 351,354 ****
--- 351,356 ----
  static int cb_ridx = 0;
  static int cb_widx = 0;
+ static gn_ringtone_list ringtone_list;
+ static int ringtone_list_initialised = 0;
  
  
***************
*** 490,493 ****
--- 492,531 ----
  }
  
+ static void init_ringtone_list(void)
+ {
+       gn_error error;
+ 
+       if (ringtone_list_initialised) return;
+ 
+       memset(&ringtone_list, 0, sizeof(ringtone_list));
+       data.ringtone_list = &ringtone_list;
+ 
+       error = gn_sm_functions(GN_OP_GetRingtoneList, &data, &state);
+ 
+       data.ringtone_list = NULL;
+ 
+       if (error != GN_ERR_NONE) {
+               ringtone_list.count = 0;
+               ringtone_list.userdef_location = 0;
+               ringtone_list.userdef_count = 0;
+               ringtone_list_initialised = -1;
+       } else
+               ringtone_list_initialised = 1;
+ }
+ 
+ static char *get_ringtone_name(int id)
+ {
+       int i;
+ 
+       init_ringtone_list();
+ 
+       for (i = 0; i < ringtone_list.count; i++) {
+               if (ringtone_list.ringtone[i].location == id)
+                       return ringtone_list.ringtone[i].name;
+       }
+ 
+       return "Unknown";
+ }
+ 
  /* Send  SMS messages. */
  static int sendsms(int argc, char *argv[])
***************
*** 2897,2905 ****
                        if (p.default_name == -1) fprintf(stdout, _(" (name 
defined)\n"));
                        fprintf(stdout, _("Incoming call alert: %s\n"), 
profile_get_call_alert_string(p.call_alert));
!                       /* For different phones different ringtones names */
!                       if (!strcmp(model, "NSE-3"))
!                               fprintf(stdout, _("Ringing tone: %s (%d)\n"), 
RingingTones[p.ringtone], p.ringtone);
!                       else
!                               fprintf(stdout, _("Ringtone number: %d\n"), 
p.ringtone);
                        fprintf(stdout, _("Ringing volume: %s\n"), 
profile_get_volume_string(p.volume));
                        fprintf(stdout, _("Message alert tone: %s\n"), 
profile_get_message_tone_string(p.message_tone));
--- 2935,2939 ----
                        if (p.default_name == -1) fprintf(stdout, _(" (name 
defined)\n"));
                        fprintf(stdout, _("Incoming call alert: %s\n"), 
profile_get_call_alert_string(p.call_alert));
!                       fprintf(stdout, _("Ringing tone: %s (%d)\n"), 
get_ringtone_name(p.ringtone), p.ringtone);
                        fprintf(stdout, _("Ringing volume: %s\n"), 
profile_get_volume_string(p.volume));
                        fprintf(stdout, _("Message alert tone: %s\n"), 
profile_get_message_tone_string(p.message_tone));
***************
*** 4020,4024 ****
        }
  
!       ringtone.location = (argc > optind + 1) ? atoi(argv[optind + 1]) : 0;
  
        if (raw)
--- 4054,4063 ----
        }
  
!       if (argc > optind + 1) {
!               ringtone.location = atoi(argv[optind + 1]);
!       } else {
!               init_ringtone_list();
!               ringtone.location = ringtone_list.userdef_location;
!       }
  
        if (raw)
***************
*** 4098,4102 ****
        }
  
!       ringtone.location = (argc > optind + 1) ? atoi(argv[optind + 1]) : 0;
  
        if (raw) {
--- 4137,4141 ----
        }
  
!       ringtone.location = (argc > optind + 1) ? atoi(argv[optind + 1]) : -1;
  
        if (raw) {
***************
*** 4239,4262 ****
  {
        gn_error error;
-       gn_ringtone_list rlist;
        int i;
  
!       memset(&rlist, 0, sizeof(rlist));
!       gn_data_clear(&data);
!       data.ringtone_list = &rlist;
  
!       if ((error = gn_sm_functions(GN_OP_GetRingtoneList, &data, &state)) != 
GN_ERR_NONE) {
!               fprintf(stderr, _("Failed to get the list of ringtones: %s\n"), 
gn_error_print(error));
!               return error;
        }
  
!       printf("First user defined ringtone location: %3d\n", 
rlist.userdef_location);
!       printf("Number of user defined ringtones: %d\n\n", rlist.userdef_count);
        printf("loc   rwu   name\n");
        printf("===============================\n");
!       for (i = 0; i < rlist.count; i++) {
!               printf("%3d   %d%d%d   %-20s\n", rlist.ringtone[i].location,
!                       rlist.ringtone[i].readable, rlist.ringtone[i].writable, 
rlist.ringtone[i].user_defined,
!                       rlist.ringtone[i].name);
        }
  
--- 4278,4300 ----
  {
        gn_error error;
        int i;
  
!       init_ringtone_list();
  
!       if (ringtone_list_initialised < 0) {
!               fprintf(stderr, _("Failed to get the list of ringtones\n"));
!               return GN_ERR_UNKNOWN;
        }
  
!       printf("First user defined ringtone location: %3d\n", 
ringtone_list.userdef_location);
!       printf("Number of user defined ringtones: %d\n\n", 
ringtone_list.userdef_count);
        printf("loc   rwu   name\n");
        printf("===============================\n");
!       for (i = 0; i < ringtone_list.count; i++) {
!               printf("%3d   %d%d%d   %-20s\n", 
ringtone_list.ringtone[i].location,
!                       ringtone_list.ringtone[i].readable,
!                       ringtone_list.ringtone[i].writable,
!                       ringtone_list.ringtone[i].user_defined,
!                       ringtone_list.ringtone[i].name);
        }