[input] Re-factor remote control #13502

afedchin · 2018-02-08T12:39:38Z

in order of preparation to an implementation of support remote control on xbox I've made refactoring current code.

xbmc/input/InputManager.h

+   *
+   * \return true if remote control is enabled, false otherwise 
+   */
+  bool IsRemoteControlExists();


xbmc/input/IRTranslator.h

@@ -34,7 +34,7 @@ class CIRTranslator
  /*!
   * \brief Loads Lircmap.xml/IRSSmap.xml
   */
-  void Load();
+  void Load(std::string irMapName);


xbmc/input/remote/IRemoteControl.h

+  virtual void Disconnect() = 0;
+
+  /*!
+   * \brief Get the button readed from IR


xbmc/input/remote/IRemoteControl.h

+   *
+   * \return A button code
+   */
+  virtual unsigned short GetButton() const = 0;


xbmc/input/remote/IRemoteControl.h

+  /*!
+   * \brief Get the time while a button was hold
+   *
+   * \return A hold time


xbmc/input/remote/IRemoteControl.h

+  /*!
+   * \brief Set enabled status
+   */
+  virtual void SetEnabled(bool) { }


xbmc/input/remote/IRemoteControl.h

+  /*!
+   * \brief Get the in-use status
+   */
+  virtual bool IsInUse() const { return false; }


xbmc/platform/linux/input/LIRC.h

+  bool IsInUse() const override { return m_used; }
+  bool IsInitialized() const override { return m_bInitialized; }
+  void AddSendCommand(const std::string& command) override;
+  std::string GetMapFile() override { return "Lircmap.xml"; }


xbmc/input/remote/IRemoteControl.h

+/*!
+  * \brief Interface for remote control
+  */
+class IRemoteControl


garbear · 2018-02-08T20:08:05Z

Really great job! All my comments are 1-liners

xbmc/input/remote/IRemoteControl.h

+  /*!
+   * \brief Get the button readed from IR
+   *
+   * \return A button code


garbear · 2018-02-08T20:23:25Z

A single request to make this refactoring even more stellar: Can you move XBIRRemote.h to your new remotes/ subdir? Maybe rename it to not include XB? thanks!

xbmc/platform/linux/input/LIRC.cpp

+  return LIRC_MAP_FILENAME;
+}
+
+void CRemoteControl::SetEnabled(bool bEnabled)


xbmc/input/remote/IRemoteControl.h

+  virtual bool IsInUse() const = 0;
+};
+  }
+}


xbmc/input/remote/IRemoteControl.h

+  /*!
+   * \brief Add a command to send to a bus
+   */
+  virtual void AddSendCommand(const std::string&) = 0;


…lasses and adapt depending code.

afedchin · 2018-02-09T13:23:13Z

if there is no more objection this will go tonight

garbear · 2018-02-09T20:26:23Z

go now

MilhouseVH · 2018-02-12T08:29:17Z

This PR is causing a problem with remote input after resuming from suspend (on Linux, specifically LibreELEC).

Starting with build #0210, when device (eg. x86_64 Revo 3700 with USB MCE IR) is resumed from suspend Kodi no longer receives any remote control inputs.

I've built the latest master Kodi with and without this PR, and the version with this PR has the resume-from-suspend issue while the version without works perfectly after resuming.

Log without PR: http://ix.io/Gjw (works perfectly after resume)
Log with PR: http://ix.io/Gjw (no remote input seen after resume)

What seems to be missing in the "bad" log is the restart of lirc - this is what happens in the "good" log after resuming:

08:18:28.901 T:139900420427136  NOTICE: OnWake: Running resume jobs
08:18:28.901 T:139900420427136   DEBUG: ------ Window Deinit (DialogBusy.xml) ------
08:18:28.901 T:139900420427136  NOTICE: OnWake: Restarting lirc
08:18:28.903 T:139898102593280   DEBUG: Thread RemoteControl start, auto delete: false
08:18:28.903 T:139898102593280    INFO: LIRC Process: using: /run/lirc/lircd
08:18:28.904 T:139898102593280    INFO: LIRC Connect: successfully started
08:18:28.905 T:139898102593280   DEBUG: Thread RemoteControl 139898102593280 terminating

afedchin · 2018-02-12T08:49:06Z

Log without PR: http://ix.io/Gjw (works perfectly after resume)
Log with PR: http://ix.io/Gjw (no remote input seen after resume)

the links are identical

MilhouseVH · 2018-02-12T08:53:45Z

Sorry, fat fingers:

Log without PR: http://ix.io/Gjw (works perfectly after resume)
Log with PR: http://ix.io/GjB (no remote input seen after resume)

afedchin · 2018-02-12T10:08:54Z

Should work now, see 5c9c318

MilhouseVH · 2018-02-12T10:22:21Z

Thanks, 5c9c318 fixes the issue.

afedchin added Type: Cleanup non-breaking change which removes non-working or unmaintained functionality Component: Input v18 Leia labels Feb 8, 2018

afedchin added this to the L 18.0-alpha1 milestone Feb 8, 2018

afedchin requested review from garbear, FernetMenta and Rechi February 8, 2018 12:39

afedchin force-pushed the remote-control branch 4 times, most recently from 5a9bbe0 to 194b73d Compare February 8, 2018 15:06