Updated to work with David's new property naming conventions.

diff --git a/src/Input/Makefile.am b/src/Input/Makefile.am
index 25948add6c1a7452ce00822e497eed02085ec989..a5b1a4524cde816695864d1b943fd29612f8a4bc 100644 (file)
--- a/src/Input/Makefile.am
+++ b/src/Input/Makefile.am
@@ -10,6 +10,6 @@ js_demo_LDADD = $(audio_LIBS)
 
 fgjs_SOURCES = fgjs.cxx jsinput.cxx jssuper.cxx
 
-fgjs_LDADD =
+fgjs_LDADD = $(audio_LIBS)
 
 INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/src

diff --git a/src/Input/fgjs.cxx b/src/Input/fgjs.cxx
index 5745aa4d89a8deac9d1f96ed881d8c976754e674..d875aff38ccd333dcf5d251aef806b051c6e69c7 100644 (file)
--- a/src/Input/fgjs.cxx
+++ b/src/Input/fgjs.cxx
@@ -52,8 +52,8 @@ string button_humannames[7]= { "apply all brakes", "apply left brake",
                                "apply nose-down trim"
                              }; 
 
-string button_propnames[7]={ "/controls/brakes/all", "/controls/brakes/left",
-                             "/controls/brakes/right", "/controls/flaps",
+string button_propnames[7]={ "/controls/brakes/all", "/controls/brakes[0]",
+                             "/controls/brakes[1]", "/controls/flaps",
                              "/controls/flaps","/controls/elevator-trim",
                              "/controls/elevator-trim" 
                            };                                                   
@@ -85,7 +85,7 @@ void waitForButton(jsSuper *jss, int wait_ms) {
 void writeAxisProperties(fstream &fs, int control,int joystick, int axis) {
      
      char jsDesc[25];
-     snprintf(jsDesc,25,"--prop:/input/js%d/axis%d",joystick,axis);
+     snprintf(jsDesc,25,"--prop:/input/joysticks/js[%d]/axis[%d]",joystick,axis);
      fs << jsDesc  << "/control=" << axes_propnames[control] << endl; 
      
      fs << jsDesc << "/dead-band=0.02"  << endl; 
@@ -103,7 +103,7 @@ void writeAxisProperties(fstream &fs, int control,int joystick, int axis) {
 void writeButtonProperties(fstream &fs, int property,int joystick, int button) {
      
      char jsDesc[25];
-     snprintf(jsDesc,25,"--prop:/input/js%d/button%d",joystick,button);
+     snprintf(jsDesc,25,"--prop:/input/joysticks/js%d/button[%d]",joystick,button);
      
      fs << jsDesc << "/action=adjust" << endl; 
      fs << jsDesc << "/control=" << button_propnames[property] << endl;