From 13a2010ed6c6c776eb5531661905d197745907e5 Mon Sep 17 00:00:00 2001
From: TwinAphex51224 <twinaphex1@gmail.com>
Date: Wed, 11 Jan 2012 01:17:04 +0100
Subject: [PATCH] (PS3) Fix

---
 Makefile.ps3             |   1 +
 ps3/main.c               |   2 +-
 ps3/pkg/USRDIR/ssnes.cfg | 335 ---------------------------------------
 3 files changed, 2 insertions(+), 336 deletions(-)
 delete mode 100644 ps3/pkg/USRDIR/ssnes.cfg

diff --git a/Makefile.ps3 b/Makefile.ps3
index a10ee6a4a4..84659ef1a8 100644
--- a/Makefile.ps3
+++ b/Makefile.ps3
@@ -72,6 +72,7 @@ $(PPU_TARGET): $(OBJ)
 	$(CXX) $(INCDIRS) $(CXXFLAGS) -c -o $@ $<
 
 pkg: $(PPU_TARGET)
+	cp ssnes.cfg ps3/pkg/USRDIR/
 	$(MAKE_FSELF_NPDRM) $(PPU_TARGET) ps3/pkg/USRDIR/EBOOT.BIN
 	$(MAKE_PACKAGE_NPDRM) ps3/pkg/package.conf ps3/pkg
 
diff --git a/ps3/main.c b/ps3/main.c
index b1214e144a..93915001f9 100644
--- a/ps3/main.c
+++ b/ps3/main.c
@@ -187,7 +187,7 @@ static void get_path_settings(bool multiman_support)
 		snprintf(SHADERS_DIR_PATH, sizeof(SHADERS_DIR_PATH), "%s/shaders", usrDirPath);
 		snprintf(DEFAULT_SHADER_FILE, sizeof(DEFAULT_SHADER_FILE), "%s/shaders/stock.cg", usrDirPath);
 		snprintf(DEFAULT_MENU_SHADER_FILE, sizeof(DEFAULT_MENU_SHADER_FILE), "%s/shaders/Borders/Menu/border-only.cg", usrDirPath);
-		snprintf(SYS_CONFIG_FILE, sizeof(SYS_CONFIG_FILE), "%s/ssnes.conf", usrDirPath);
+		snprintf(SYS_CONFIG_FILE, sizeof(SYS_CONFIG_FILE), "%s/ssnes.cfg", usrDirPath);
 	}
 }
 
diff --git a/ps3/pkg/USRDIR/ssnes.cfg b/ps3/pkg/USRDIR/ssnes.cfg
deleted file mode 100644
index 953ed6c23b..0000000000
--- a/ps3/pkg/USRDIR/ssnes.cfg
+++ /dev/null
@@ -1,335 +0,0 @@
-##### Config file for SSNES
-
-# Save all save files (*.srm) to this directory. This includes related files like .bsv, .rtc, .psrm, etc ...
-# This will be overridden by explicit command line options.
-# savefile_directory =
-
-# Save all save states (*.state) to this directory.
-# This will be overridden by explicit command line options.
-# savestate_directory =
-
-## If enabled, load libsnes from a dynamic location.
-# libsnes_path = "/path/to/libsnes.so"
-
-#### Video
-
-# Video driver to use. "gl", "xvideo", "sdl" or "ext" (external API driver)
-# video_driver = "gl"
-
-# Path to external video driver using the SSNES driver API.
-# video_external_driver =
-
-# Windowed xscale and yscale
-# (Real x res: base_size * xscale * aspect_ratio, real y res: base_size * yscale)
-# video_xscale = 3.0
-# video_yscale = 3.0
-
-# Fullscreen resolution. Resolution of 0 uses the resolution of the desktop.
-# video_fullscreen_x = 0
-# video_fullscreen_y = 0
-
-# Start in fullscreen. Can be changed at runtime.
-# video_fullscreen = false
-
-# Force 16-bit colors. Apparently some video cards in use today have troubles with 32-bit ...
-# video_force_16bit = false
-
-# Forcibly disable composition. Only works in Windows Vista/7 for now.
-# video_disable_composition = false
-
-# Video vsync.
-# video_vsync = true
-
-# Smoothens picture with bilinear filtering. Should be disabled if using pixel shaders.
-# video_smooth = true
-
-# Forces rendering area to stay equal to SNES aspect ratio 4:3 or as defined in video_aspect_ratio.
-# video_force_aspect = true
-
-# A floating point value for video aspect ratio (width / height)
-# video_aspect_ratio = 1.333
-
-# Forces cropping of overscanned frames. Crops away top 7 scanlines and 8 bottom scanlines. (15/15 for interlaced frames).
-# video_crop_overscan = false
-
-# Path to Cg shader.
-# video_cg_shader = "/path/to/cg/shader.cg"
-
-# Path to bSNES XML shader (GLSL only). If both Cg shader path and XML shader path are defined, 
-# Cg shader will take priority unless overridden in video_shader_type.
-# video_bsnes_shader = "/path/to/bsnes/xml/shader.shader"
-
-# Which shader type to use. Valid values are "cg", "bsnes", "none" and "auto"
-# video_shader_type = auto
-
-# Defines a directory where XML shaders are kept.
-# video_shader_dir =
-
-# Render to texture first. Useful when doing multi-pass shaders or control the output of shaders better.
-# video_render_to_texture = false
-
-# Defines the video scale of render-to-texture. 
-# The output FBO size is scaled by these amounts against the input size (typically 256 * 224 for SNES).
-# video_fbo_scale_x = 2.0
-# video_fbo_scale_y = 2.0
-
-# Define shader to use for second pass (needs render-to-texture).
-# video_second_pass_shader = "/path/to/second/shader.{cg,shader}"
-
-# Defines if bilinear filtering is used during second pass (needs render-to-texture).
-# video_second_pass_smooth = true
-
-# CPU-based filter. Path to a bSNES CPU filter (*.filter)
-# video_filter =
-
-# Path to a TTF font used for rendering messages. This path must be defined to enable fonts.
-# Do note that the _full_ path of the font is necessary!
-# video_font_path = 
-
-# Size of the TTF font rendered.
-# video_font_size = 48
-
-# Enable usage of OSD messages.
-# video_font_enable = true
-
-# Offset for where messages will be placed on screen. Values are in range 0.0 to 1.0 for both x and y values. 
-# [0.0, 0.0] maps to the lower left corner of the screen.
-# video_message_pos_x = 0.05
-# video_message_pos_y = 0.05
-
-# Color for message. The value is treated as a hexadecimal value.
-# It is a regular RGB hex number, i.e. red is "ff0000".
-# video_message_color = ffffff
-
-# Video refresh rate of your monitor.
-# Used to calculate a suitable audio input rate.
-# video_refresh_rate = 59.95
-
-#### Audio
-
-# Enable audio.
-# audio_enable = true
-
-# Audio output samplerate.
-# audio_out_rate = 48000
-
-# When altering audio_in_rate on-the-fly, define by how much each time.
-# audio_rate_step = 0.25
-
-# Audio driver backend. Depending on configuration possible candidates are: alsa, pulse, oss, jack, rsound, roar, openal, sdl, xaudio and ext (external driver).
-# audio_driver =
-
-# Path to external audio driver using the SSNES audio driver API.
-# audio_external_driver =
-
-# Override the default audio device the audio_driver uses. This is driver dependant. E.g. ALSA wants a PCM device, OSS wants a path (e.g. /dev/dsp), Jack wants portnames (e.g. system:playback1,system:playback_2), and so on ...
-# audio_device =
-
-# External DSP plugin that processes audio before it's sent to the driver.
-# audio_dsp_plugin =
-
-# Will sync (block) on audio. Recommended.
-# audio_sync = true
-
-# Desired audio latency in milliseconds. Might not be honored if driver can't provide given latency.
-# audio_latency = 64
-
-
-### Input
-
-# Input driver. Depending on video driver, it might force a different input driver.
-# input_driver = sdl
-
-# Defines axis threshold. Possible values are [0.0, 1.0]
-# input_axis_threshold = 0.5
-
-# Keyboard input. Will recognize normal keypresses and special keys like "left", "right", and so on.
-# Keyboard input, Joypad and Joyaxis will all obey the "nul" bind, which disables the bind completely, 
-# rather than relying on a default.
-# input_player1_a = x
-# input_player1_b = z
-# input_player1_y = a
-# input_player1_x = s
-# input_player1_start = enter
-# input_player1_select = rshift
-# input_player1_l = q
-# input_player1_r = w
-# input_player1_left = left
-# input_player1_right = right
-# input_player1_up = up
-# input_player1_down = down
-
-# If desired, it is possible to override which joypads are being used for player 1 through 5. First joypad available is 0.
-# input_player1_joypad_index = 0
-# input_player2_joypad_index = 1
-# input_player3_joypad_index = 2
-# input_player4_joypad_index = 3
-# input_player5_joypad_index = 4
-
-# Joypad buttons. Figure these out by looking at jstest /dev/input/js0 output, or use ssnes-joyconfig.
-# You can use joypad hats with hnxx, where n is the hat, and xx is a string representing direction. 
-# E.g. "h0up"
-# input_player1_a_btn = 1
-# input_player1_b_btn = 0
-# input_player1_y_btn = 2
-# input_player1_x_btn = 3
-# input_player1_start_btn = 7
-# input_player1_select_btn = 6
-# input_player1_l_btn = 4
-# input_player1_r_btn = 5
-# input_player1_left_btn = 11
-# input_player1_right_btn = 12
-# input_player1_up_btn = 13
-# input_player1_down_btn = 14
-
-# Axis for SNES DPAD. 
-# Needs to be either '+' or '-' in the first character signaling either positive or negative direction of the axis, then the axis number. 
-# Do note that every other input option has the corresponding _btn and _axis binds as well; they are omitted here for clarity.
-# input_player1_left_axis = -0
-# input_player1_right_axis = +0
-# input_player1_up_axis = +1
-# input_player1_down_axis = -1
-
-# Same stuff, just for player two.
-# input_player2_a = 
-# input_player2_b =
-# input_player2_y =
-# input_player2_x =
-# input_player2_start =
-# input_player2_select =
-# input_player2_l =
-# input_player2_r =
-# input_player2_left =
-# input_player2_right =
-# input_player2_up =
-# input_player2_down =
-
-# input_player2_a_btn = 1
-# input_player2_b_btn = 0
-# input_player2_y_btn = 2
-# input_player2_x_btn = 3
-# input_player2_start_btn = 7
-# input_player2_select_btn = 6
-# input_player2_l_btn = 4
-# input_player2_r_btn = 5
-# input_player2_left_btn = 11
-# input_player2_right_btn = 12
-# input_player2_up_btn = 13
-# input_player2_down_btn = 14
-
-
-# input_player2_left_axis = -0
-# input_player2_right_axis = +0
-# input_player2_up_axis = -1
-# input_player2_down_axis = +1
-
-# This goes all the way to player 5, but again omitted for clarity.
-
-# Toggles fullscreen.
-# input_toggle_fullscreen = f
-# Saves state.
-# input_save_state = f2
-# Loads state.
-# input_load_state = f4
-
-# State slots. With slot set to 0, save state name is *.state (or whatever defined on commandline).
-# When slot is != 0, path will be $path%d, where %d is slot number.
-# input_state_slot_increase = f7
-# input_state_slot_decrease = f6
-
-# Toggles between fast-forwarding and normal speed.
-# input_toggle_fast_forward = space
-
-# Hold for fast-forward. Releasing button disables fast-forward.
-# input_hold_fast_forward = l
-
-# Key to exit emulator cleanly. 
-# Killing it in any hard way (SIGTERM, SIGKILL, etc, will terminate emulator without saving RAM, etc.)
-# input_exit_emulator = escape
-
-# Decrease/increase input sample rate on the fly. Amount to decrease/increase is defined by audio_rate_step.
-# input_rate_step_up = kp_plus
-# input_rate_step_down = kp_minus
-
-# Applies next and previous XML shader in directory.
-# input_shader_next = m
-# input_shader_prev = n
-
-# Enable rewinding. This will take a performance hit when playing, so it is disabled by default.
-# Do note that rewinding will only work properly when using bSNES libsnes core atm.
-# rewind_enable = true
-
-# Rewinding buffer size in megabytes. Bigger rewinding buffer means you can rewind longer.
-# The buffer should be approx. 20MB per minute of buffer time.
-# rewind_buffer_size = 20
-
-# Rewind granularity. When rewinding defined number of frames, you can rewind several frames at a time, increasing the rewinding speed.
-# rewind_granularity = 1
-
-# Hold button down to rewind. Rewinding must be enabled.
-# input_rewind = r
-
-# Toggle between recording and not.
-# input_movie_record_toggle = o
-
-# Toggle between paused and non-paused state
-# input_pause_toggle = p
-
-# Frame advance when game is paused
-# input_frame_advance = k
-
-# Reset the emulated SNES.
-# input_reset = h
-
-# Configures DSP plugin
-# input_dsp_config = c
-
-# Pause gameplay when window focus is lost.
-# pause_nonactive = true
-
-# Autosaves the non-volatile SRAM at a regular interval. This is disabled by default unless set otherwise.
-# The interval is measured in seconds. A value of 0 disables autosave.
-# autosave_interval =
-
-# When being client over netplay, use keybinds for player 1.
-# netplay_client_swap_input = false
-
-
-# Path to XML cheat database (as used by bSNES).
-# cheat_database_path =
-
-# Path to XML cheat config, a file which keeps track of which
-# cheat settings are used for individual games.
-# If the file does not exist, it will be created.
-# cheat_settings_path =
-
-# Cheats.
-# input_cheat_index_plus = y
-# input_cheat_index_minus = t
-# input_cheat_toggle = u
-
-# Mute/unmute audio
-# input_audio_mute = f9
-
-# Take screenshot
-# input_screenshot = print_screen
-
-# Directory to dump screenshots to.
-# screenshot_directory =
-
-# Records video assuming video is hi-res.
-# video_hires_record = false
-
-# Records video after CPU video filter.
-# video_post_filter_record = false
-
-# Block SRAM from being overwritten when loading save states.
-# Might potentially lead to buggy games.
-# block_sram_overwrite = false
-
-# When saving a savestate, save state index is automatically increased before
-# it is saved.
-# Also, when loading a ROM, the index will be set to the highest existing index.
-# There is no upper bound on the index.
-# savestate_auto_index = false
-