Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e330a7fd authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Revert "floss: avrcp: organized media information and pass to btif""... 

Merge "Revert "floss: avrcp: organized media information and pass to btif"" am: a3771759 am: d5436c1d

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2270538



Change-Id: Ia61165ebf1e2744491b55abaa8591b8a031b8c3d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 56c8a052 d5436c1d

system/gd/rust/topshim/btav/btav_shim.cc

+2 −61
Original line number Diff line number Diff line
@@ -37,13 +37,9 @@ class AvrcpMediaInterfaceImpl : public MediaInterface { 
    rusty::avrcp_send_key_event(key, state == KeyState::PUSHED);

  }



  void GetSongInfo(SongInfoCallback cb) override {

    songInfoCb_ = std::move(cb);

  }

  void GetSongInfo([[maybe_unused]] SongInfoCallback cb) override {}



  void GetPlayStatus(PlayStatusCallback cb) override {

    playStatusCb_ = std::move(cb);

  }

  void GetPlayStatus([[maybe_unused]] PlayStatusCallback cb) override {}



  void GetNowPlayingList([[maybe_unused]] NowPlayingCallback cb) override {}
@@ -70,43 +66,6 @@ class AvrcpMediaInterfaceImpl : public MediaInterface { 
    topshim::rust::RustRawAddress addr = rusty::CopyToRustAddress(address);

    rusty::avrcp_set_active_device(addr);

  }



  void SetPlaybackStatus(const PlayState& state) {

    if (!playStatusCb_) return;



    playStatus_.state = state;

    playStatusCb_.Run(playStatus_);

  }



  void SetPosition(int64_t position_us) {

    if (!playStatusCb_) return;



    // Unit conversion from microsecond to millisecond.

    playStatus_.position = position_us / 1000;

    playStatusCb_.Run(playStatus_);

  }



  void SetMetadata(const std::string& title, const std::string& artist, const std::string& album, int64_t length_us) {

    SongInfo song_info;



    if (title.length() || artist.length() || album.length()) {

      song_info.attributes.emplace(avrcp::AttributeEntry(avrcp::Attribute::TITLE, title));

      song_info.attributes.emplace(avrcp::AttributeEntry(avrcp::Attribute::ARTIST_NAME, artist));

      song_info.attributes.emplace(avrcp::AttributeEntry(avrcp::Attribute::ALBUM_NAME, album));



      if (songInfoCb_) songInfoCb_.Run(song_info);

    }



    // Unit conversion from microsecond to millisecond.

    playStatus_.duration = length_us / 1000;

    if (playStatusCb_ && !length_us) playStatusCb_.Run(playStatus_);

  }



 private:

  PlayStatusCallback playStatusCb_;

  SongInfoCallback songInfoCb_;



  PlayStatus playStatus_;

};



class VolumeInterfaceImpl : public VolumeInterface {
@@ -348,24 +307,6 @@ uint32_t AvrcpIntf::disconnect(RustRawAddress bt_addr) { 
void AvrcpIntf::set_volume(int8_t volume) {

  return mVolumeInterface.SetDeviceVolume(volume);

}



void AvrcpIntf::set_playback_status(const ::rust::String& status) {

  avrcp::PlayState state = avrcp::PlayState::STOPPED;



  if (status == "stopped") state = avrcp::PlayState::STOPPED;

  if (status == "playing") state = avrcp::PlayState::PLAYING;

  if (status == "paused") state = avrcp::PlayState::PAUSED;



  mAvrcpInterface.SetPlaybackStatus(state);

}



void AvrcpIntf::set_position(int64_t position) {

  mAvrcpInterface.SetPosition(position);

}

void AvrcpIntf::set_metadata(

    const ::rust::String& title, const ::rust::String& artist, const ::rust::String& album, int64_t length_us) {

  mAvrcpInterface.SetMetadata((std::string&)title, (std::string&)artist, (std::string&)album, length_us);

}

}  // namespace rust

}  // namespace topshim

}  // namespace bluetooth

system/gd/rust/topshim/btav/btav_shim.h

+3 −3
Original line number Diff line number Diff line
@@ -72,10 +72,10 @@ class AvrcpIntf { 
  // interface for Audio server

  void set_volume(int8_t volume);



  void set_playback_status(const ::rust::String& status);

  void set_position(int64_t position_us);

  void set_playback_status(const ::rust::String& status) {}

  void set_position(int64_t position_us) {}

  void set_metadata(

      const ::rust::String& title, const ::rust::String& artist, const ::rust::String& album, int64_t length_us);

      const ::rust::String& title, const ::rust::String& artist, const ::rust::String& album, int64_t length_us) {}



 private:

  bluetooth::avrcp::ServiceInterface* intf_;