Skip to content

Commit

Permalink
Merge branch 'music-assistant:main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
marcelveldt authored Jan 7, 2025
2 parents 4107839 + e0ffb19 commit 2a694b9
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 8 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
name: ci
name: deploy-pages
on:
workflow_dispatch:
push:
branches:
- master
Expand Down
15 changes: 8 additions & 7 deletions docs/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,29 +30,30 @@ Music Assistant is a music library manager for your offline and online music sou
Music Assistant consists of multiple building blocks:

- Music Assistant Server ([Installation Instructions](installation.md))
- Music Assistant Integration for Home Assistant ([Installation Instructions](integration/installation.md))
- An optional sub-component of the Integraton is the Home Assistant Plugin for Music Assistant. This allows the importing of Home Assistant media players into the Music Assistant engine to use as targets for playback
- Home Assistant Integration ([Installation Instructions](integration/installation.md))
- Music Providers: Import your music from various sources into Music Assistant.
- Player Providers: Play your music on a wide collection of player ecosystems.
- An optional Home Assistant Plugin for Music Assistant, which allows the importing of Home Assistant media players into the Music Assistant engine to use as targets for playback

## Music Assistant Server

The Music Assistant server is a free, opensource Media library manager that connects to your streaming services and a wide range of connected speakers. The server is the beating heart, the core of Music Assistant and it keeps track of your music sources. It must run on an always-on device like a Raspberry Pi, a NAS or an Intel NUC or alike. The server can access multiple music providers and stream to multiple player types.

![MA Banner](assets/MA_banner.png)

## Music Assistant Integration
## Home Assistant Integration

Connects Home Assistant to your Music Assistant Server to allow control from your HA instance, allow you to automate your music and allows voice control! The Integration also allows the exposure of HA media players to MA furthering the options you have for playback.

## Preview

![Preview image](assets/screenshots/screen2.png){width=800 }
![Preview image](assets/screenshots/screen2.png){width=800 }

??? note "Click to show more screenshots"

![Preview image](assets/screenshots/screen3.png){width=800 }

![Preview image](assets/screenshots/screen1.png){width=800 }
![Preview image](assets/screenshots/screen3.png){width=800 }

![Preview image](assets/screenshots/screen1.png){width=800 }

## The Team

Expand Down

0 comments on commit 2a694b9

Please sign in to comment.