Pass ringtone by pointer

Signed-off-by: Michal Čihař <michal@cihar.com>
gammu · Aug 22, 2016 · c8e3078 · c8e3078
1 parent fa42d95
commit c8e3078
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/gammu/misc.c b/gammu/misc.c
@@ -195,7 +195,7 @@ void PrintBatteryCharge(GSM_BatteryCharge *BatteryCharge)
 	}
 }
 
-GSM_Error GSM_PlayRingtone(GSM_Ringtone ringtone)
+GSM_Error GSM_PlayRingtone(GSM_Ringtone *ringtone)
 {
 	int 		i;
 	gboolean 		first=TRUE;
@@ -204,11 +204,11 @@ GSM_Error GSM_PlayRingtone(GSM_Ringtone ringtone)
 	signal(SIGINT, interrupt);
 	printf("%s\n", _("Press Ctrl+C to break..."));
 
-	for (i=0;i<ringtone.NoteTone.NrCommands;i++) {
+	for (i = 0; i < ringtone->NoteTone.NrCommands; i++) {
 		if (gshutdown) break;
-		if (ringtone.NoteTone.Commands[i].Type != RING_Note) continue;
-		error=PHONE_RTTLPlayOneNote(gsm,ringtone.NoteTone.Commands[i].Note,first);
-		if (error!=ERR_NONE) return error;
+		if (ringtone->NoteTone.Commands[i].Type != RING_Note) continue;
+		error = PHONE_RTTLPlayOneNote(gsm, ringtone->NoteTone.Commands[i].Note, first);
+		if (error != ERR_NONE) return error;
 		first = FALSE;
 	}
 
@@ -230,7 +230,7 @@ void PlayRingtone(int argc UNUSED, char *argv[])
 
 	GSM_Init(TRUE);
 
-	error=GSM_PlayRingtone(ringtone2);
+	error = GSM_PlayRingtone(&ringtone2);
 	Print_Error(error);
 
 	GSM_Terminate();

diff --git a/gammu/misc.h b/gammu/misc.h
@@ -47,7 +47,7 @@ extern void SetAutoNetworkLogin(int argc, char *argv[]);
 extern void GetFMStation(int argc, char *argv[]);
 extern void CallDivert(int argc, char *argv[]);
 extern void CancelAllDiverts(int argc, char *argv[]);
-extern GSM_Error GSM_PlayRingtone(GSM_Ringtone ringtone);
+extern GSM_Error GSM_PlayRingtone(GSM_Ringtone *ringtone);
 extern void Battery(int argc, char *argv[]);
 extern void Screenshot(int argc, char *argv[]);
 extern void Install(int argc, char *argv[]);
diff --git a/helper/message-display.c b/helper/message-display.c
@@ -418,7 +418,7 @@ void DisplayMultiSMSInfo (GSM_MultiSMSMessage *sms, gboolean eachsms, gboolean e
 #if 0
 			/* Disabled for now */
 			if (answer_yes("%s", _("Do you want to play it?")))
-				GSM_PlayRingtone(*SMSInfo.Entries[i].Ringtone);
+				GSM_PlayRingtone(SMSInfo.Entries[i].Ringtone);
 #endif
 			break;
 		case SMS_NokiaCallerLogo: