~aleteoryx/muditaos

9ea80abef6edd21efe07421acb0583e68b594501 — Mateusz Piesta 4 years ago 410af7e 
[EGD-8066] Fixed Bell audio assets path

Paths had bell in them, not needed
patch browse .tar.gz 
6 files changed, 44 insertions(+), 44 deletions(-)

M products/BellHybrid/BellHybridMain.cpp
M products/BellHybrid/alarms/src/AlarmSoundPaths.cpp
M products/BellHybrid/apps/application-bell-background-sounds/ApplicationBellBackgroundSounds.cpp
M products/BellHybrid/apps/application-bell-background-sounds/models/BGSoundsRepository.hpp
M products/BellHybrid/apps/application-bell-meditation-timer/windows/MeditationRunningWindow.cpp
M products/BellHybrid/assets_images.json

M products/BellHybrid/BellHybridMain.cpp => products/BellHybrid/BellHybridMain.cpp +1 -1
@@ 51,7 51,7 @@ int main()
    constexpr auto ApplicationName = "BellHybrid";

    const std::vector<std::string> fileIndexerAudioPaths = {
        {purefs::dir::getCurrentOSPath() / "assets/audio/bell/bg_sounds"}};
        {purefs::dir::getCurrentOSPath() / "assets/audio/bg_sounds"}};

#if SYSTEM_VIEW_ENABLED
    SEGGER_SYSVIEW_Conf();


M products/BellHybrid/alarms/src/AlarmSoundPaths.cpp => products/BellHybrid/alarms/src/AlarmSoundPaths.cpp +4 -4
@@ 9,7 9,7 @@ namespace alarms::paths
{
    std::filesystem::path getAlarmDir() noexcept
    {
        return purefs::dir::getCurrentOSPath() / "assets/audio/bell/alarm";
        return purefs::dir::getCurrentOSPath() / "assets/audio/alarm";
    }

    std::filesystem::path getMusicDir() noexcept


@@ 19,16 19,16 @@ namespace alarms::paths

    std::filesystem::path getPreWakeUpChimesDir() noexcept
    {
        return purefs::dir::getCurrentOSPath() / "assets/audio/bell/prewakeup";
        return purefs::dir::getCurrentOSPath() / "assets/audio/prewakeup";
    }

    std::filesystem::path getSnoozeChimesDir() noexcept
    {
        return purefs::dir::getCurrentOSPath() / "assets/audio/bell/chimes";
        return purefs::dir::getCurrentOSPath() / "assets/audio/chimes";
    }

    std::filesystem::path getBedtimeReminderChimesDir() noexcept
    {
        return purefs::dir::getCurrentOSPath() / "assets/audio/bell/evening_reminder";
        return purefs::dir::getCurrentOSPath() / "assets/audio/evening_reminder";
    }
} // namespace alarms::paths


M products/BellHybrid/apps/application-bell-background-sounds/ApplicationBellBackgroundSounds.cpp => products/BellHybrid/apps/application-bell-background-sounds/ApplicationBellBackgroundSounds.cpp +1 -1
@@ 23,7 23,7 @@
namespace
{
    const auto backgroundSoundsFilesPath =
        purefs::createPath(purefs::dir::getCurrentOSPath(), "assets/audio/bell/bg_sounds").string();
        purefs::createPath(purefs::dir::getCurrentOSPath(), "assets/audio/bg_sounds").string();
}

namespace app


M products/BellHybrid/apps/application-bell-background-sounds/models/BGSoundsRepository.hpp => products/BellHybrid/apps/application-bell-background-sounds/models/BGSoundsRepository.hpp +1 -1
@@ 52,7 52,7 @@ namespace app::bgSounds

    class BGSoundsRepository : public AbstractSoundsRepository, public app::AsyncCallbackReceiver
    {
        static constexpr auto bgsoundsSubfolderPath = "assets/audio/bell/bg_sounds";
        static constexpr auto bgsoundsSubfolderPath = "assets/audio/bg_sounds";

      public:
        using OnGetMusicFilesListCallback =


M products/BellHybrid/apps/application-bell-meditation-timer/windows/MeditationRunningWindow.cpp => products/BellHybrid/apps/application-bell-meditation-timer/windows/MeditationRunningWindow.cpp +1 -1
@@ 15,7 15,7 @@ namespace
    inline constexpr auto meditationProgressTimerName = "MeditationProgressTimer";
    inline constexpr std::chrono::seconds baseTick{1};
    inline constexpr auto meditationProgressMode = app::ProgressCountdownMode::Increasing;
    inline constexpr auto meditationAudioPath    = "assets/audio/bell/meditation/Meditation_Gong.mp3";
    inline constexpr auto meditationAudioPath    = "assets/audio/meditation/Meditation_Gong.mp3";

    using namespace app::meditationStyle;



M products/BellHybrid/assets_images.json => products/BellHybrid/assets_images.json +36 -36
@@ 213,41 213,41 @@
        {"name": "release2.tgz", "tarfile" :"image/assets/images/bluetooth_32px_W_M.vpi", "output": "assets/images/bluetooth_32px_W_M.vpi"},
        {"name": "release2.tgz", "tarfile" :"image/assets/images/ice_32px_W_G.vpi", "output": "assets/images/ice_32px_W_G.vpi"},

        {"name": "release_audio.tgz", "tarfile" :"./image/assets/audio/bell/chimes/Gentle_Chime.mp3", "output": "assets/audio/bell/chimes/Gentle_Chime.mp3"},
        {"name": "release_audio.tgz", "tarfile" :"./image/assets/audio/bell/chimes/Rise_&_Shine.mp3", "output": "assets/audio/bell/chimes/Rise_&_Shine.mp3"},
        {"name": "release_audio.tgz", "tarfile" :"./image/assets/audio/bell/chimes/Twinkle_Chime.mp3", "output": "assets/audio/bell/chimes/Twinkle_Chime.mp3"},
        {"name": "release_audio.tgz", "tarfile" :"./image/assets/audio/bell/bg_sounds/Natures_Harmony.mp3", "output": "assets/audio/bell/bg_sounds/Natures_Harmony.mp3"},
        {"name": "release_audio.tgz", "tarfile" :"./image/assets/audio/bell/bg_sounds/Ancient_Greek.mp3", "output": "assets/audio/bell/bg_sounds/Ancient_Greek.mp3"},
        {"name": "release_audio.tgz", "tarfile" :"./image/assets/audio/bell/bg_sounds/Mystic_Nature.mp3", "output": "assets/audio/bell/bg_sounds/Mystic_Nature.mp3"},
        {"name": "release_audio.tgz", "tarfile" :"./image/assets/audio/bell/bg_sounds/Charming_Bells.mp3", "output": "assets/audio/bell/bg_sounds/Charming_Bells.mp3"},
        {"name": "release_audio.tgz", "tarfile" :"./image/assets/audio/bell/bg_sounds/Autumnal_Sea.mp3", "output": "assets/audio/bell/bg_sounds/Autumnal_Sea.mp3"},
        {"name": "release_audio.tgz", "tarfile" :"./image/assets/audio/bell/bg_sounds/Seaside_Symphony.mp3", "output": "assets/audio/bell/bg_sounds/Seaside_Symphony.mp3"},
        {"name": "release_audio.tgz", "tarfile" :"./image/assets/audio/bell/bg_sounds/Rhythmic_Lullaby.mp3", "output": "assets/audio/bell/bg_sounds/Rhythmic_Lullaby.mp3"},
        {"name": "release_audio.tgz", "tarfile" :"./image/assets/audio/bell/bg_sounds/Woodland_Ambiance.mp3", "output": "assets/audio/bell/bg_sounds/Woodland_Ambiance.mp3"},
        {"name": "release_audio.tgz", "tarfile" :"./image/assets/audio/bell/bg_sounds/Forest_Creek.mp3", "output": "assets/audio/bell/bg_sounds/Forest_Creek.mp3"},
        {"name": "release_audio.tgz", "tarfile" :"./image/assets/audio/bell/bg_sounds/Bubbling_Brook.mp3", "output": "assets/audio/bell/bg_sounds/Bubbling_Brook.mp3"},
        {"name": "release_audio.tgz", "tarfile" :"./image/assets/audio/bell/bg_sounds/Under_the_Water.mp3", "output": "assets/audio/bell/bg_sounds/Under_the_Water.mp3"},
        {"name": "release_audio.tgz", "tarfile" :"./image/assets/audio/bell/bg_sounds/Mountain_Lagoon.mp3", "output": "assets/audio/bell/bg_sounds/Mountain_Lagoon.mp3"},
        {"name": "release_audio.tgz", "tarfile" :"./image/assets/audio/bell/meditation/Meditation_Gong.mp3", "output": "assets/audio/bell/meditation/Meditation_Gong.mp3"},
        {"name": "release_audio.tgz", "tarfile" :"./image/assets/audio/bell/prewakeup/Morning_Spirit.mp3", "output": "assets/audio/bell/prewakeup/Morning_Spirit.mp3"},
        {"name": "release_audio.tgz", "tarfile" :"./image/assets/audio/bell/prewakeup/Joyful_Awakening.mp3", "output": "assets/audio/bell/prewakeup/Joyful_Awakening.mp3"},
        {"name": "release_audio.tgz", "tarfile" :"./image/assets/audio/bell/prewakeup/Spring_Sunrise.mp3", "output": "assets/audio/bell/prewakeup/Spring_Sunrise.mp3"},
        {"name": "release_audio.tgz", "tarfile" :"./image/assets/audio/bell/prewakeup/Radiant_Morning.mp3", "output": "assets/audio/bell/prewakeup/Radiant_Morning.mp3"},
        {"name": "release_audio.tgz", "tarfile" :"./image/assets/audio/bell/alarm/Delightful_Morning.mp3", "output": "assets/audio/bell/alarm/Delightful_Morning.mp3"},
        {"name": "release_audio.tgz", "tarfile" :"./image/assets/audio/bell/alarm/Melodious_Chords.mp3", "output": "assets/audio/bell/alarm/Melodious_Chords.mp3"},
        {"name": "release_audio.tgz", "tarfile" :"./image/assets/audio/bell/alarm/Natures_Harmony.mp3", "output": "assets/audio/bell/alarm/Natures_Harmony.mp3"},
        {"name": "release_audio.tgz", "tarfile" :"./image/assets/audio/bell/alarm/Gentle_Daybreak.mp3", "output": "assets/audio/bell/alarm/Gentle_Daybreak.mp3"},
        {"name": "release_audio.tgz", "tarfile" :"./image/assets/audio/bell/alarm/Rhytmical_Hangdrum.mp3", "output": "assets/audio/bell/alarm/Rhytmical_Hangdrum.mp3"},
        {"name": "release_audio.tgz", "tarfile" :"./image/assets/audio/bell/alarm/Joyous_Morning.mp3", "output": "assets/audio/bell/alarm/Joyous_Morning.mp3"},
        {"name": "release_audio.tgz", "tarfile" :"./image/assets/audio/bell/alarm/Sunrise_Guitar.mp3", "output": "assets/audio/bell/alarm/Sunrise_Guitar.mp3"},
        {"name": "release_audio.tgz", "tarfile" :"./image/assets/audio/bell/alarm/Autumnal_Sea.mp3", "output": "assets/audio/bell/alarm/Autumnal_Sea.mp3"},
        {"name": "release_audio.tgz", "tarfile" :"./image/assets/audio/bell/alarm/Koshi_Bells.mp3", "output": "assets/audio/bell/alarm/Koshi_Bells.mp3"},
        {"name": "release_audio.tgz", "tarfile" :"./image/assets/audio/bell/alarm/Brand_New_Morning.mp3", "output": "assets/audio/bell/alarm/Brand_New_Morning.mp3"},
        {"name": "release_audio.tgz", "tarfile" :"./image/assets/audio/bell/alarm/Morning_Dew.mp3", "output": "assets/audio/bell/alarm/Morning_Dew.mp3"},
        {"name": "release_audio.tgz", "tarfile" :"./image/assets/audio/bell/alarm/Bubbling_Brook.mp3", "output": "assets/audio/bell/alarm/Bubbling_Brook.mp3"},
        {"name": "release_audio.tgz", "tarfile" :"./image/assets/audio/bell/evening_reminder/Evening_Horizon.mp3", "output": "assets/audio/bell/evening_reminder/Evening_Horizon.mp3"},
        {"name": "release_audio.tgz", "tarfile" :"./image/assets/audio/bell/evening_reminder/Evolving_Dusk.mp3", "output": "assets/audio/bell/evening_reminder/Evolving_Dusk.mp3"},
        {"name": "release_audio.tgz", "tarfile" :"./image/assets/audio/bell/evening_reminder/Melodic_Mirth.mp3", "output": "assets/audio/bell/evening_reminder/Melodic_Mirth.mp3"},
        {"name": "release_audio.tgz", "tarfile" :"./image/assets/audio/bell/evening_reminder/Twilight_Gleam.mp3", "output": "assets/audio/bell/evening_reminder/Twilight_Gleam.mp3"}
        {"name": "release_audio.tgz", "tarfile" :"./image/assets/audio/bell/chimes/Gentle_Chime.mp3", "output": "assets/audio/chimes/Gentle_Chime.mp3"},
        {"name": "release_audio.tgz", "tarfile" :"./image/assets/audio/bell/chimes/Rise_&_Shine.mp3", "output": "assets/audio/chimes/Rise_&_Shine.mp3"},
        {"name": "release_audio.tgz", "tarfile" :"./image/assets/audio/bell/chimes/Twinkle_Chime.mp3", "output": "assets/audio/chimes/Twinkle_Chime.mp3"},
        {"name": "release_audio.tgz", "tarfile" :"./image/assets/audio/bell/bg_sounds/Natures_Harmony.mp3", "output": "assets/audio/bg_sounds/Natures_Harmony.mp3"},
        {"name": "release_audio.tgz", "tarfile" :"./image/assets/audio/bell/bg_sounds/Ancient_Greek.mp3", "output": "assets/audio/bg_sounds/Ancient_Greek.mp3"},
        {"name": "release_audio.tgz", "tarfile" :"./image/assets/audio/bell/bg_sounds/Mystic_Nature.mp3", "output": "assets/audio/bg_sounds/Mystic_Nature.mp3"},
        {"name": "release_audio.tgz", "tarfile" :"./image/assets/audio/bell/bg_sounds/Charming_Bells.mp3", "output": "assets/audio/bg_sounds/Charming_Bells.mp3"},
        {"name": "release_audio.tgz", "tarfile" :"./image/assets/audio/bell/bg_sounds/Autumnal_Sea.mp3", "output": "assets/audio/bg_sounds/Autumnal_Sea.mp3"},
        {"name": "release_audio.tgz", "tarfile" :"./image/assets/audio/bell/bg_sounds/Seaside_Symphony.mp3", "output": "assets/audio/bg_sounds/Seaside_Symphony.mp3"},
        {"name": "release_audio.tgz", "tarfile" :"./image/assets/audio/bell/bg_sounds/Rhythmic_Lullaby.mp3", "output": "assets/audio/bg_sounds/Rhythmic_Lullaby.mp3"},
        {"name": "release_audio.tgz", "tarfile" :"./image/assets/audio/bell/bg_sounds/Woodland_Ambiance.mp3", "output": "assets/audio/bg_sounds/Woodland_Ambiance.mp3"},
        {"name": "release_audio.tgz", "tarfile" :"./image/assets/audio/bell/bg_sounds/Forest_Creek.mp3", "output": "assets/audio/bg_sounds/Forest_Creek.mp3"},
        {"name": "release_audio.tgz", "tarfile" :"./image/assets/audio/bell/bg_sounds/Bubbling_Brook.mp3", "output": "assets/audio/bg_sounds/Bubbling_Brook.mp3"},
        {"name": "release_audio.tgz", "tarfile" :"./image/assets/audio/bell/bg_sounds/Under_the_Water.mp3", "output": "assets/audio/bg_sounds/Under_the_Water.mp3"},
        {"name": "release_audio.tgz", "tarfile" :"./image/assets/audio/bell/bg_sounds/Mountain_Lagoon.mp3", "output": "assets/audio/bg_sounds/Mountain_Lagoon.mp3"},
        {"name": "release_audio.tgz", "tarfile" :"./image/assets/audio/bell/meditation/Meditation_Gong.mp3", "output": "assets/audio/meditation/Meditation_Gong.mp3"},
        {"name": "release_audio.tgz", "tarfile" :"./image/assets/audio/bell/prewakeup/Morning_Spirit.mp3", "output": "assets/audio/prewakeup/Morning_Spirit.mp3"},
        {"name": "release_audio.tgz", "tarfile" :"./image/assets/audio/bell/prewakeup/Joyful_Awakening.mp3", "output": "assets/audio/prewakeup/Joyful_Awakening.mp3"},
        {"name": "release_audio.tgz", "tarfile" :"./image/assets/audio/bell/prewakeup/Spring_Sunrise.mp3", "output": "assets/audio/prewakeup/Spring_Sunrise.mp3"},
        {"name": "release_audio.tgz", "tarfile" :"./image/assets/audio/bell/prewakeup/Radiant_Morning.mp3", "output": "assets/audio/prewakeup/Radiant_Morning.mp3"},
        {"name": "release_audio.tgz", "tarfile" :"./image/assets/audio/bell/alarm/Delightful_Morning.mp3", "output": "assets/audio/alarm/Delightful_Morning.mp3"},
        {"name": "release_audio.tgz", "tarfile" :"./image/assets/audio/bell/alarm/Melodious_Chords.mp3", "output": "assets/audio/alarm/Melodious_Chords.mp3"},
        {"name": "release_audio.tgz", "tarfile" :"./image/assets/audio/bell/alarm/Natures_Harmony.mp3", "output": "assets/audio/alarm/Natures_Harmony.mp3"},
        {"name": "release_audio.tgz", "tarfile" :"./image/assets/audio/bell/alarm/Gentle_Daybreak.mp3", "output": "assets/audio/alarm/Gentle_Daybreak.mp3"},
        {"name": "release_audio.tgz", "tarfile" :"./image/assets/audio/bell/alarm/Rhytmical_Hangdrum.mp3", "output": "assets/audio/alarm/Rhytmical_Hangdrum.mp3"},
        {"name": "release_audio.tgz", "tarfile" :"./image/assets/audio/bell/alarm/Joyous_Morning.mp3", "output": "assets/audio/alarm/Joyous_Morning.mp3"},
        {"name": "release_audio.tgz", "tarfile" :"./image/assets/audio/bell/alarm/Sunrise_Guitar.mp3", "output": "assets/audio/alarm/Sunrise_Guitar.mp3"},
        {"name": "release_audio.tgz", "tarfile" :"./image/assets/audio/bell/alarm/Autumnal_Sea.mp3", "output": "assets/audio/alarm/Autumnal_Sea.mp3"},
        {"name": "release_audio.tgz", "tarfile" :"./image/assets/audio/bell/alarm/Koshi_Bells.mp3", "output": "assets/audio/alarm/Koshi_Bells.mp3"},
        {"name": "release_audio.tgz", "tarfile" :"./image/assets/audio/bell/alarm/Brand_New_Morning.mp3", "output": "assets/audio/alarm/Brand_New_Morning.mp3"},
        {"name": "release_audio.tgz", "tarfile" :"./image/assets/audio/bell/alarm/Morning_Dew.mp3", "output": "assets/audio/alarm/Morning_Dew.mp3"},
        {"name": "release_audio.tgz", "tarfile" :"./image/assets/audio/bell/alarm/Bubbling_Brook.mp3", "output": "assets/audio/alarm/Bubbling_Brook.mp3"},
        {"name": "release_audio.tgz", "tarfile" :"./image/assets/audio/bell/evening_reminder/Evening_Horizon.mp3", "output": "assets/audio/evening_reminder/Evening_Horizon.mp3"},
        {"name": "release_audio.tgz", "tarfile" :"./image/assets/audio/bell/evening_reminder/Evolving_Dusk.mp3", "output": "assets/audio/evening_reminder/Evolving_Dusk.mp3"},
        {"name": "release_audio.tgz", "tarfile" :"./image/assets/audio/bell/evening_reminder/Melodic_Mirth.mp3", "output": "assets/audio/evening_reminder/Melodic_Mirth.mp3"},
        {"name": "release_audio.tgz", "tarfile" :"./image/assets/audio/bell/evening_reminder/Twilight_Gleam.mp3", "output": "assets/audio/evening_reminder/Twilight_Gleam.mp3"}
    ]
}