\r\n -> \n

[gnokii.git] / common / gsm-ringtones.c

diff --git a/common/gsm-ringtones.c b/common/gsm-ringtones.c
index 588ddad..3db43b6 100644 (file)
--- a/common/gsm-ringtones.c
+++ b/common/gsm-ringtones.c
@@ -223,62 +223,62 @@ u8 GSM_PackRingtone(GSM_Ringtone *ringtone, unsigned char *package, int *maxleng
   int DefNoteTempo=63;
   u8 DefNoteStyle=NaturalStyle;
   
-  int buffer[6];\r              /* Used to find default ringtone parameters */
-  int i,j,k=0,thisnote,thisnotelong;\r
+  int buffer[6];              /* Used to find default ringtone parameters */
+  int i,j,k=0,thisnote,thisnotelong;
   
-  /* Find the most frequently used duration and use this for the default */\r
- \r for (i=0;i<6;i++) buffer[i]=0;\r
-  for (i=0;i<ringtone->NrNotes;i++) {\r
-    switch (ringtone->notes[i].duration) {\r
-      case 192: buffer[0]++; break;\r
-      case 128: buffer[0]++; break;\r
-      case  96:        buffer[1]++; break;\r
-      case  64: buffer[1]++; break;\r
-      case  48: buffer[2]++; break;\r
-      case  32: buffer[2]++; break;\r
-      case  24: buffer[3]++; break;\r
-      case  16: buffer[3]++; break;\r
-      case  12: buffer[4]++; break;\r
-      case   8: buffer[4]++; break;\r
-      case   6: buffer[5]++; break;\r
-      case   4: buffer[5]++; break;\r
-    }\r
-  }\r
-\r
-  /* Now find the most frequently used */\r
-  j=0;\r
-  for (i=0;i<6;i++) {\r
-    if (buffer[i]>j) {\r
-      k=i; \r
-      j=buffer[i];\r
-    }\r
-  }\r
-\r
-  /* Finally convert the default duration */\r
-  switch (k) {\r
-      case 0: DefNoteDuration=128; break;      \r
-      case 1: DefNoteDuration= 64; break;      \r
-      case 2: DefNoteDuration= 32; break;      \r
-      case 3: DefNoteDuration= 16; break;      \r
-      case 4: DefNoteDuration=  8; break;      \r
-      case 5: DefNoteDuration=  4; break;      \r
-     default: DefNoteDuration= 16; break;      \r
-  }  \r
-\r
-  /* Find the most frequently used scale and use this for the default */\r\r
-  for (i=0;i<6;i++) buffer[i]=0;\r
-  for (i=0;i<ringtone->NrNotes;i++) {\r
-    if (ringtone->notes[i].note!=255) {\r
-      buffer[ringtone->notes[i].note/14]++;\r
-    }\r
-  }\r
-  j=0;\r
-  for (i=0;i<6;i++) {\r
-    if (buffer[i]>j) {\r
-      DefNoteScale=i;\r
-      j=buffer[i];\r
-    }\r
-  }\r
+  /* Find the most frequently used duration and use this for the default */
+  for (i=0;i<6;i++) buffer[i]=0;
+  for (i=0;i<ringtone->NrNotes;i++) {
+    switch (ringtone->notes[i].duration) {
+      case 192: buffer[0]++; break;
+      case 128: buffer[0]++; break;
+      case  96:        buffer[1]++; break;
+      case  64: buffer[1]++; break;
+      case  48: buffer[2]++; break;
+      case  32: buffer[2]++; break;
+      case  24: buffer[3]++; break;
+      case  16: buffer[3]++; break;
+      case  12: buffer[4]++; break;
+      case   8: buffer[4]++; break;
+      case   6: buffer[5]++; break;
+      case   4: buffer[5]++; break;
+    }
+  }
+
+  /* Now find the most frequently used */
+  j=0;
+  for (i=0;i<6;i++) {
+    if (buffer[i]>j) {
+      k=i; 
+      j=buffer[i];
+    }
+  }
+
+  /* Finally convert the default duration */
+  switch (k) {
+      case 0: DefNoteDuration=128; break;      
+      case 1: DefNoteDuration= 64; break;      
+      case 2: DefNoteDuration= 32; break;      
+      case 3: DefNoteDuration= 16; break;      
+      case 4: DefNoteDuration=  8; break;      
+      case 5: DefNoteDuration=  4; break;      
+     default: DefNoteDuration= 16; break;      
+  }  
+
+  /* Find the most frequently used scale and use this for the default */
+  for (i=0;i<6;i++) buffer[i]=0;
+  for (i=0;i<ringtone->NrNotes;i++) {
+    if (ringtone->notes[i].note!=255) {
+      buffer[ringtone->notes[i].note/14]++;
+    }
+  }
+  j=0;
+  for (i=0;i<6;i++) {
+    if (buffer[i]>j) {
+      DefNoteScale=i;
+      j=buffer[i];
+    }
+  }
 
   StartBit=BitPackByte(package, StartBit, CommandLength, 8);
   StartBit=BitPackByte(package, StartBit, RingingToneProgramming, 7);