Ticket #6713: joystick_volume_6713.diff

libmythui/jsmenu.h

@@ -28 +28 @@
     QString keystring;
 } axisMapType;
 
+typedef struct
+{
+    int axis;
+    int min;
+    int max;
+    QString control;
+} axisBindControl_s;
+
 /**
  *  \class JoystickMap
  *
@@ -61 +69 @@
             m_axisMap.push_back(new_axis);
         }
 
+        void AddAxisBindControl(int in_axis, int min, int max, QString in_control = "volume") {
+            axisBindControl_s new_bind = { in_axis, min, max, in_control};
+            m_axisBindControl.push_back(new_bind);
+        }
+
         typedef std::vector<buttonMapType> button_map_t;
         typedef std::vector<axisMapType> axis_map_t;
+        typedef std::vector<axisBindControl_s> axisBindControl_t;
         const button_map_t &buttonMap() { return m_buttonMap; }
         const axis_map_t &axisMap() { return m_axisMap; }
+        const axisBindControl_t &axisBindControl() { return m_axisBindControl; }
 
         button_map_t m_buttonMap;
         axis_map_t m_axisMap;
+        axisBindControl_t m_axisBindControl;
 };
 
 /**

libmythui/jsmenu.cpp

@@ -41 +41 @@
 
 // Myth headers
 #include "mythverbose.h"
+#include "libmyth/volumebase.h"
 
 // Mythui headers
 #include "jsmenu.h"
@@ -186 +187 @@
                           tokens[3].toInt(), tokens[4]);
         else if (firstTok.startsWith("chord") && tokens.count() == 4)
             m_map.AddButton(tokens[2].toInt(), tokens[3], tokens[1].toInt());
+        else if (firstTok.startsWith("bind_axis") && tokens.count() == 5)
+            m_map.AddAxisBindControl(tokens[1].toInt(), tokens[2].toInt(), tokens[3].toInt(), tokens[4]);
         else
             VERBOSE(VB_IMPORTANT, LOC_ERROR + QString("ReadConfig(%1) "
                                         "unrecognized or malformed line "
@@ -377 +380 @@
                     EmitKey(amap->keystring);
         }
     }
+    JoystickMap::axisBindControl_t::const_iterator abmap;
+    for (abmap = m_map.axisBindControl().begin(); abmap < m_map.axisBindControl().end(); ++abmap)
+    {
+        if (axis == abmap->axis) {
+            if (abmap->control == "volume") {
+                if (vbase_hack) {
+                    float difference = abmap->max - abmap->min;
+                    float newvol = ((float)(value - abmap->min) / difference) * 100.0;
+                    VERBOSE(VB_IMPORTANT, QString("updating volume to %1(translated from %2)").arg(newvol).arg(value));
+                    vbase_hack->SetCurrentVolume(newvol);
+                }
+            } else {
+                VERBOSE(VB_IMPORTANT, QString("'%1' doesnt match '%2'").arg(abmap->control).arg("volume"));
+            }
+        }
+    }
 }

libmythui/libmythui.pro

@@ -10 +10 @@
 INCLUDEPATH += ../libmythdb 
 INCLUDEPATH += ../.. ../
 
-LIBS += -L../libmythdb -lmythdb-$$LIBVERSION
+LIBS += -L../libmythdb -lmythdb-$$LIBVERSION -L../libmyth -lmyth-$$LIBVERSION
 
 QMAKE_CLEAN += $(TARGET) $(TARGETA) $(TARGETD) $(TARGET0) $(TARGET1) $(TARGET2)
 

libmyth/volumebase.cpp

@@ -6 +6 @@
 using namespace std;
 #include "volumebase.h"
 
+VolumeBase *vbase_hack;
+
 VolumeBase::VolumeBase() :
     internal_vol(false), volume(80), 
     current_mute_state(kMuteOff)
 {
+    vbase_hack = this;
 }
+VolumeBase::~VolumeBase()
+{
+    vbase_hack = NULL;
+}
 
 uint VolumeBase::GetCurrentVolume(void) const
 {

libmyth/volumebase.h

@@ -18 +18 @@
 {
   public:
     VolumeBase();    
-    virtual ~VolumeBase() {};
+    virtual ~VolumeBase();
 
     virtual uint GetCurrentVolume(void) const;
     virtual void SetCurrentVolume(int value);
@@ -47 +47 @@
 
 };
 
+extern VolumeBase *vbase_hack;
+
 #endif