Re: [hatari-devel] Falcon Sound

[Jerome Vernet <vernet.jerome@xxxxxxxxxx>]

Hi Thomas

Le 09/10/2016 à 08:58, Thomas Huth a écrit :
> Am Sat, 8 Oct 2016 21:04:47 +0200
> schrieb Jerome Vernet <vernet.jerome@xxxxxxxxxx>:
>
> Thanks. I've updated the repository with your changes. For the next
> time you send an update, I've got two requests, though:
>
> - Now that we do not have binary NIB files in the repository anymore,
>   please start to send proper patches instead of sending a zipped
>   update of your local tree. The latter has a couple of disadvantages:
>  
Just to understand, I must send the result of hg diff . in gui-osx ?
Like in diff.txt joinded ?
>     files, e.g. the *.m and *.h have the "executable" flag set.
Changed that
>
> - Hatari coding style is to indent with TABs, not with spaces. I've
>   tried to fixd the files manually this time, but for future changes,
>   please configure your editor properly to respect the coding style.
I didn't even know that there is an option for that. Found it in XCode,
changed, sorry!

Regards

Jerome
>  Thanks,
>   Thomas
>
>

diff -r 1f73df77a7b5 src/gui-osx/Hatari.icns
Binary file src/gui-osx/Hatari.icns has changed
diff -r 1f73df77a7b5 src/gui-osx/PrefsController.m
--- a/src/gui-osx/PrefsController.m	Sun Oct 09 08:50:31 2016 +0200
+++ b/src/gui-osx/PrefsController.m	Sun Oct 09 20:15:30 2016 +0200
@@ -33,8 +33,8 @@
 #include "joy.h"
 
 // Macros to transfer data between Cocoa controls and Hatari data structures
+// de l'affichage vers la structure  (saveAllControls)
 
-// de l'affichage vers la structure  (saveAllControls)
 #define EXPORT_TEXTFIELD(mutablStrng, target) [mutablStrng getCString:target maxLength:sizeof((target))-1 encoding:NSASCIIStringEncoding]
 #define EXPORT_NTEXTFIELD(nstextfield, target) target = [nstextfield intValue]
 #define EXPORT_SWITCH(nsbutton, target) target = ([(nsbutton) state] == NSOnState)
@@ -53,7 +53,7 @@
 #define INITIAL_DIR(dossier) [dossier length] < 2 ? @"~" : dossier
 
 // Back up of the current configuration parameters
-//
+
 CNF_PARAMS CurrentParams;
 
 
@@ -456,17 +456,17 @@
 	opnPanel.canChooseDirectories = NO ;
 	opnPanel.canChooseFiles = YES ;
 	opnPanel.accessoryView = partage ;
-//10.5 ?
-//	if ([opnPanel respondsToSelector:@selector(setDirectoryURL:)])
+	//10.5 ?
+	//	if ([opnPanel respondsToSelector:@selector(setDirectoryURL:)])
 	 {	opnPanel.directoryURL = [NSURL fileURLWithPath:ru isDirectory:YES] ;
 		opnPanel.nameFieldStringValue = @"hatari" ;
-		btOk = [opnPanel runModal] == NSModalResponseOK;								// Ok ?
+		btOk = [opnPanel runModal] == NSModalResponseOK;				// Ok ?
 	 }
-// 10.5 ?
-//	else
-//        btOk = [opnPanel runModalForDirectory:ru file:@"hatari"] == NSModalResponseOK; //NSOKButton 	;
+	// 10.5 ?
+	//	else
+	//        btOk = [opnPanel runModalForDirectory:ru file:@"hatari"] == NSModalResponseOK; //NSOKButton 	;
 
-	if (!btOk)  return ;																// Cancel
+	if (!btOk)  return ;												// Cancel
 
 	lesURLs = opnPanel.URLs ;
 	if ((lesURLs == nil) || (lesURLs.count == 0))
@@ -474,13 +474,13 @@
 
 	[configNm setString:[[lesURLs objectAtIndex:0] path]] ;
 
-		// Make a non-const C string out of it
+	// Make a non-const C string out of it
 	[configNm getCString:sConfigFileName maxLength:FILENAME_MAX encoding:NSASCIIStringEncoding];
 
-		// Load the config into ConfigureParams
+	// Load the config into ConfigureParams
 	Configuration_Load(sConfigFileName);
 
-		// Refresh all the controls to match ConfigureParams
+	// Refresh all the controls to match ConfigureParams
 	[self setAllControls];
 }
 
@@ -788,12 +788,12 @@
 		[FPUType selectCellWithTag:3];
 	IMPORT_SWITCH(CompatibleFPU, ConfigureParams.System.bCompatibleFPU);
 #endif
-
+	
 	int i;
 	for (i = 0; i <= DLGSOUND_50KHZ-DLGSOUND_11KHZ; i++)
 	{
 		if (ConfigureParams.Sound.nPlaybackFreq > nSoundFreqs[i]-500
-		    && ConfigureParams.Sound.nPlaybackFreq < nSoundFreqs[i]+500)
+			&& ConfigureParams.Sound.nPlaybackFreq < nSoundFreqs[i]+500)
 		{
 			[playbackQuality selectCellWithTag:(i)];
 			break;
@@ -897,13 +897,13 @@
 
 	// Data validation: If the JoyID is out of bounds, correct it and, if set to use real joystick, change to disabled
 	if ( (ConfigureParams.Joysticks.Joy[nCurrentJoystick].nJoyId < 0)
-	|| (ConfigureParams.Joysticks.Joy[nCurrentJoystick].nJoyId >= cRealJoysticks) )
+		|| (ConfigureParams.Joysticks.Joy[nCurrentJoystick].nJoyId >= cRealJoysticks) )
 	{
 		ConfigureParams.Joysticks.Joy[nCurrentJoystick].nJoyId = 0;
 		if (ConfigureParams.Joysticks.Joy[nCurrentJoystick].nJoystickMode == JOYSTICK_REALSTICK)
 		{
 			ConfigureParams.Joysticks.Joy[nCurrentJoystick].nJoystickMode = JOYSTICK_DISABLED;
-		}	
+		}
 	}
 
 	// Don't change the realJoystick dropdown if none is available (to keep "(None available)" selected)