@christianriedl/media 1.0.302 → 1.0.304

package/dist/iMedia.d.ts

@@ -317,15 +317,33 @@ export interface IMediaService {
     getCloudUrl(folder: string, name: string): Promise<string>;
     getStatus(): Promise<Dictionary<boolean | number | string> | null>;
 }
-export interface IRssFeed {
+export interface IRssItem {
     title: string;
-    description: string;
+    description?: string;
     link: string;
-    copyright?: string;
-    items?: IRssFeed[];
     mediaType?: string;
     duration?: number;
 }
+export declare enum EFeedType {
+    Unknown = 0,
+    Movie = 1,
+    Podcast = 2,
+    Music = 3,
+    MusicVideo = 4,
+    Audiobook = 5,
+    ShortFilm = 6,
+    TvShow = 7,
+    Ebook = 8
+}
+export interface IRssFeed extends IRssItem {
+    rssUrl: string;
+    genre?: string;
+    country?: string;
+    copyright?: string;
+    owner?: string;
+    imageUrl?: string;
+    items?: IRssItem[];
+}
 export declare const getPlaylistSymbol: InjectionKey<() => IPlaylistService>;
 export declare enum EPlaylistCommand {
     None = 0,
@@ -346,13 +364,12 @@ export interface IPlaylistState {
 export interface IPlaylistService {
     log: ILogger;
     soundbarOn: boolean;
-    getTitles(): Promise<string[]>;
-    getFeed(title: string): Promise<IRssFeed | null>;
-    getFeeds(): Promise<IRssFeed[]>;
-    addFeed(url: string, save: boolean): Promise<IRssFeed | null>;
-    deleteFeed(title: string): Promise<boolean>;
+    soundbarVolume: number;
+    searchFeeds(query: Dictionary<any>, limit?: number): Promise<IRssFeed[]>;
+    getFeed(rssUrl: string): Promise<IRssFeed | null>;
     play(url: string): Promise<boolean>;
     playList(urls: string[], clear: boolean, index?: number): Promise<boolean>;
     playCommand(cmd: EPlaylistCommand): Promise<boolean>;
+    setSoundbarVolume(value: number): Promise<boolean>;
     getState(): Promise<IPlaylistState | null>;
 }

package/dist/iMedia.js

@@ -121,6 +121,18 @@ export var EPictureFlags;
     EPictureFlags[EPictureFlags["Mask"] = 240] = "Mask";
 })(EPictureFlags || (EPictureFlags = {}));
 export const getMediaSymbol = Symbol("get-media");
+export var EFeedType;
+(function (EFeedType) {
+    EFeedType[EFeedType["Unknown"] = 0] = "Unknown";
+    EFeedType[EFeedType["Movie"] = 1] = "Movie";
+    EFeedType[EFeedType["Podcast"] = 2] = "Podcast";
+    EFeedType[EFeedType["Music"] = 3] = "Music";
+    EFeedType[EFeedType["MusicVideo"] = 4] = "MusicVideo";
+    EFeedType[EFeedType["Audiobook"] = 5] = "Audiobook";
+    EFeedType[EFeedType["ShortFilm"] = 6] = "ShortFilm";
+    EFeedType[EFeedType["TvShow"] = 7] = "TvShow";
+    EFeedType[EFeedType["Ebook"] = 8] = "Ebook";
+})(EFeedType || (EFeedType = {}));
 export const getPlaylistSymbol = Symbol("get-playlist");
 export var EPlaylistCommand;
 (function (EPlaylistCommand) {

package/dist/iMedia.js.map

@@ -1 +1 @@
-{"version":3,"file":"iMedia.js","sourceRoot":"","sources":["../src/iMedia.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"iMedia.js","sourceRoot":"","sources":["../src/iMedia.ts"],"names":[],"mappings":"AAGA,MAAM,CAAN,IAAY,UASX;AATD,WAAY,UAAU;IAClB,6CAAS,CAAA;IACT,6CAAS,CAAA;IACT,iDAAW,CAAA;IACX,4CAAS,CAAA;IACT,0DAAgB,CAAA;IAChB,iDAAa,CAAA;IACb,6CAAW,CAAA;IACX,mDAAc,CAAA;AAClB,CAAC,EATW,UAAU,KAAV,UAAU,QASrB;AACD,MAAM,CAAN,IAAY,eAeX;AAfD,WAAY,eAAe;IACvB,qDAAiB,CAAA;IACjB,gEAAoB,CAAA;IACpB,gEAAoB,CAAA;IACpB,gEAAoB,CAAA;IACpB,gEAAoB,CAAA;IACpB,kEAAoB,CAAA;IACpB,gEAAoB,CAAA;IACpB,gEAAoB,CAAA;IACpB,gEAAoB,CAAA;IACpB,kEAAoB,CAAA;IACpB,4DAAoB,CAAA;IACpB,4DAAoB,CAAA;IACpB,4DAAoB,CAAA;IACpB,8DAAoB,CAAA;AACxB,CAAC,EAfW,eAAe,KAAf,eAAe,QAe1B;AAaD,MAAM,CAAN,IAAY,SAoDX;AApDD,WAAY,SAAS;IACjB,yCAAQ,CAAA;IACR,mDAAa,CAAA;IACb,uDAAe,CAAA;IACf,uDAAe,CAAA;IACf,6DAAkB,CAAA;IAClB,iEAAoB,CAAA;IACpB,iEAAoB,CAAA;IACpB,iEAAoB,CAAA;IACpB,iEAAoB,CAAA;IACpB,mDAAgB,CAAA;IAChB,6CAAa,CAAA;IACb,4CAAY,CAAA;IACZ,4CAAY,CAAA;IACZ,gDAAc,CAAA;IACd,6DAAoB,CAAA;IACpB,qDAAgB,CAAA;IAChB,yCAAa,CAAA;IACb,mDAA6C,CAAA;IAC7C,oDAA0B,CAAA;IAC1B,wDAAkC,CAAA;IAClC,wDAAkC,CAAA;IAClC,8DAAqC,CAAA;IACrC,sDAAiC,CAAA;IACjC,wDAAkC,CAAA;IAClC,sDAAiC,CAAA;IACjC,0DAAmC,CAAA;IACnC,uEAA0C,CAAA;IAC1C,2EAA8C,CAAA;IAC9C,sDAAkB,CAAA;IAClB,+DAAkC,CAAA;IAClC,oDAA0B,CAAA;IAC1B,wDAAkC,CAAA;IAClC,wDAAkC,CAAA;IAClC,8DAAqC,CAAA;IACrC,4DAAoC,CAAA;IACpC,uEAA0C,CAAA;IAC1C,2EAA8C,CAAA;IAC9C,yEAA+C,CAAA;IAC/C,oDAAiB,CAAA;IACjB,+DAAkC,CAAA;IAClC,wDAA8B,CAAA;IAC9B,4DAAsC,CAAA;IACtC,4DAAsC,CAAA;IACtC,kEAAyC,CAAA;IACzC,gEAAwC,CAAA;IACxC,wDAAoC,CAAA;IACpC,0DAAqC,CAAA;IACrC,wDAAqB,CAAA;IACrB,uDAA+C,CAAA;IAC/C,qDAAgB,CAAA;IAChB,yCAAU,CAAA;AACd,CAAC,EApDW,SAAS,KAAT,SAAS,QAoDpB;AACD,MAAM,CAAN,IAAY,MAUX;AAVD,WAAY,MAAM;IACd,mCAAQ,CAAA;IACR,yDAAsB,CAAA;IACtB,2CAAe,CAAA;IACf,+CAAiB,CAAA;IACjB,qDAAoB,CAAA;IACpB,kDAAkB,CAAA;IAClB,sDAAoB,CAAA;IACpB,0DAAsB,CAAA;IACtB,+DAAwB,CAAA;AAC5B,CAAC,EAVW,MAAM,KAAN,MAAM,QAUjB;AAkDD,MAAM,CAAN,IAAY,YAaX;AAbD,WAAY,YAAY;IAEpB,+CAAY,CAAA;IACZ,qDAAmB,CAAA;IACnB,yDAAmB,CAAA;IACnB,6DAAmB,CAAA;IACnB,2DAAmB,CAAA;IACnB,qEAAmB,CAAA;IACnB,uDAAmB,CAAA;IACnB,mEAAmB,CAAA;IACnB,2DAAmB,CAAA;IACnB,yDAAiB,CAAA;IACjB,gDAAe,CAAA;AACnB,CAAC,EAbW,YAAY,KAAZ,YAAY,QAavB;AACD,MAAM,CAAN,IAAY,aAaX;AAbD,WAAY,aAAa;IAErB,iDAAe,CAAA;IACf,yDAAkB,CAAA;IAClB,gDAAkB,CAAA;IAClB,sDAAkB,CAAA;IAClB,oDAAkB,CAAA;IAClB,kDAAkB,CAAA;IAClB,sDAAkB,CAAA;IAClB,oDAAkB,CAAA;IAClB,qDAAkB,CAAA;IAClB,6DAAkB,CAAA;IAClB,mDAAkB,CAAA;AACtB,CAAC,EAbW,aAAa,KAAb,aAAa,QAaxB;AA6FD,MAAM,CAAC,MAAM,cAAc,GAAsC,MAAM,CAAC,WAAW,CAAC,CAAC;AA2ErF,MAAM,CAAN,IAAY,SAGX;AAHD,WAAY,SAAS;IAEjB,+CAAW,CAAA;IAAE,2CAAS,CAAA;IAAE,+CAAW,CAAA;IAAE,2CAAS,CAAA;IAAE,qDAAc,CAAA;IAAE,mDAAa,CAAA;IAAE,mDAAa,CAAA;IAAE,6CAAU,CAAA;IAAE,2CAAS,CAAA;AACvH,CAAC,EAHW,SAAS,KAAT,SAAS,QAGpB;AAWD,MAAM,CAAC,MAAM,iBAAiB,GAAyC,MAAM,CAAC,cAAc,CAAC,CAAC;AAC9F,MAAM,CAAN,IAAY,gBAEX;AAFD,WAAY,gBAAgB;IACxB,uDAAQ,CAAA;IAAE,uDAAI,CAAA;IAAE,yDAAK,CAAA;IAAE,2DAAM,CAAA;IAAE,uDAAI,CAAA;IAAE,uDAAI,CAAA;IAAE,+DAAQ,CAAA;AACvD,CAAC,EAFW,gBAAgB,KAAhB,gBAAgB,QAE3B"}

package/dist/playlistService.d.ts

@@ -1,22 +1,21 @@
 import { IRest } from '@christianriedl/rest';
-import { ILogger } from '@christianriedl/utils';
+import { ILogger, Dictionary } from '@christianriedl/utils';
 import { IRssFeed, EPlaylistCommand, IPlaylistState, IPlaylistService } from "./iMedia";
 export declare class PlaylistService implements IPlaylistService {
     rest: IRest;
     mediaUrl: string;
     log: ILogger;
     soundbarOn: boolean;
+    soundbarVolume: number;
     setSoundbar: (name: string, value: string) => Promise<boolean>;
-    getSoundbarValue: (name: string) => string;
-    constructor(rest: IRest, log: ILogger, getSoundbarValue: (name: string) => string, setSoundbar: (name: string, value: string) => Promise<boolean>);
-    getTitles(): Promise<string[]>;
-    getFeed(title: string): Promise<IRssFeed | null>;
-    getFeeds(): Promise<IRssFeed[]>;
-    addFeed(url: string, save: boolean): Promise<IRssFeed | null>;
-    deleteFeed(title: string): Promise<boolean>;
+    getSoundbarValue: (name: string) => any;
+    constructor(rest: IRest, log: ILogger, getSoundbarValue: (name: string) => any, setSoundbar: (name: string, value: string) => Promise<boolean>);
+    searchFeeds(query: Dictionary<any>, limit?: number): Promise<IRssFeed[]>;
+    getFeed(rssUrl: string): Promise<IRssFeed | null>;
     play(url: string): Promise<boolean>;
     playList(urls: string[], clear: boolean, index?: number): Promise<boolean>;
     playCommand(cmd: EPlaylistCommand): Promise<boolean>;
     getState(): Promise<IPlaylistState | null>;
-    ensureOn(): Promise<boolean>;
+    ensureSoundbarOn(): Promise<boolean>;
+    setSoundbarVolume(value: number): Promise<boolean>;
 }

package/dist/playlistService.js

@@ -5,6 +5,7 @@ export class PlaylistService {
     mediaUrl;
     log;
     soundbarOn;
+    soundbarVolume;
     setSoundbar;
     getSoundbarValue;
     constructor(rest, log, getSoundbarValue, setSoundbar) {
@@ -15,35 +16,46 @@ export class PlaylistService {
         this.setSoundbar = setSoundbar;
         this.soundbarOn = false;
     }
-    async getTitles() {
-        const res = await this.rest.getData('apiplaylist/title');
+    async searchFeeds(query, limit) {
+        query['limit'] = limit ?? 50;
+        const res = await this.rest.getData('apiplaylist/feed/search', query);
         return res.ok ? res.result : [];
     }
-    async getFeed(title) {
-        const res = await this.rest.getData('apiplaylist/feed', { title: title });
+    async getFeed(rssUrl) {
+        const res = await this.rest.getData('apiplaylist/feed', { rssUrl: rssUrl });
         return res.ok ? res.result : null;
     }
-    async getFeeds() {
-        const res = await this.rest.getData('apiplaylist/feed');
-        return res.ok ? res.result : [];
+    /*
+    async getTitles(): Promise<string[]> {
+        const res = await this.rest.getData<string[]>('apiplaylist/title');
+        return res.ok ? res.result as string[] : [];
     }
-    async addFeed(url, save) {
-        const res = await this.rest.postDataEx(`apiplaylist/feed?url=${encodeURIComponent(url)}&save=${save}`);
-        return res.ok ? res.result.result : null;
+    async getFeed(title: string): Promise<IRssFeed|null> {
+        const res = await this.rest.getData<IRssFeed>('apiplaylist/feed', { title: title });
+        return res.ok ? res.result as IRssFeed : null;
     }
-    async deleteFeed(title) {
-        const res = await this.rest.deleteData(`apiplaylist/feed?title=${encodeURIComponent(title)}`);
-        return res.ok ? res.result : false;
+    async getFeeds(): Promise<IRssFeed[]> {
+        const res = await this.rest.getData<IRssFeed[]>('apiplaylist/feed');
+        return res.ok ? res.result as IRssFeed[] : [];
+    }
+    async addFeed(url: string, save: boolean): Promise<IRssFeed|null> {
+        const res = await this.rest.postDataEx<boolean,IRssFeed>(`apiplaylist/feed?url=${encodeURIComponent(url)}&save=${save}`);
+        return res.ok ? (res.result as IValueResult<IRssFeed>).result : null;
     }
+    async deleteFeed(title: string): Promise<boolean> {
+        const res = await this.rest.deleteData<any, boolean>(`apiplaylist/feed?title=${encodeURIComponent(title)}`);
+        return res.ok ? res.result as boolean : false;
+    }
+    */
     async play(url) {
-        this.soundbarOn = await this.ensureOn();
+        this.soundbarOn = await this.ensureSoundbarOn();
         if (!this.soundbarOn)
             return false;
         const res = await this.rest.postData(`apiplaylist/play?url=${encodeURIComponent(url)}`);
         return res.ok ? res.result : false;
     }
     async playList(urls, clear, index) {
-        this.soundbarOn = await this.ensureOn();
+        this.soundbarOn = await this.ensureSoundbarOn();
         if (!this.soundbarOn)
             return false;
         let url = `apiplaylist/play?clear=${clear}`;
@@ -53,7 +65,7 @@ export class PlaylistService {
         return res.ok ? res.result : false;
     }
     async playCommand(cmd) {
-        this.soundbarOn = await this.ensureOn();
+        this.soundbarOn = await this.ensureSoundbarOn();
         if (!this.soundbarOn)
             return false;
         let url = `apiplaylist/playcommand?cmd=${EPlaylistCommand[cmd]}`;
@@ -61,15 +73,16 @@ export class PlaylistService {
         return res.ok ? res.result : false;
     }
     async getState() {
+        this.soundbarVolume = Number(this.getSoundbarValue('Volume'));
         const res = await this.rest.getData('apiplaylist/state');
         return res.ok ? res.result : null;
     }
-    async ensureOn() {
+    async ensureSoundbarOn() {
         let i = 0;
         for (i = 0; i < 5; i++) {
-            if (this.getSoundbarValue('ON') === 'ON')
+            if (this.getSoundbarValue('On') === true)
                 break;
-            const result = await this.setSoundbar('POWER', 'on');
+            const result = await this.setSoundbar('POWERON', '1');
             await Helper.delay(1000);
         }
         if (i >= 5)
@@ -82,5 +95,9 @@ export class PlaylistService {
         }
         return false;
     }
+    async setSoundbarVolume(value) {
+        const result = await this.setSoundbar('VOLUME', value.toString());
+        return result;
+    }
 }
 //# sourceMappingURL=playlistService.js.map

package/dist/playlistService.js.map

@@ -1 +1 @@
-{"version":3,"file":"playlistService.js","sourceRoot":"","sources":["../src/playlistService.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"playlistService.js","sourceRoot":"","sources":["../src/playlistService.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@christianriedl/media",
-  "version": "1.0.302",
+  "version": "1.0.304",
   "description": "RIC media interfaces",
 
   "main": "dist/index.js",

package/src/views/OnlinePodcastsPage.vue

@@ -1,9 +1,9 @@
 <script setup lang="ts">
     import { inject, ref, reactive, computed, onMounted, onUnmounted, nextTick, watch, StyleValue } from 'vue';
     import type { ComponentPublicInstance } from 'vue';
-    import { useRouter } from 'vue-router';
-    import { IAppState, EScope, EDevice, appStateSymbol, appConfigSymbol } from '@christianriedl/utils';
-    import { getPlaylistSymbol, IPlaylistService, IPlaylistState, IRssFeed, EPlaylistCommand } from '@christianriedl/media';
+    import { useRouter, useRoute } from 'vue-router';
+    import { IAppState, EScope, EDevice, Helper, appStateSymbol, appConfigSymbol, Dictionary } from '@christianriedl/utils';
+    import { getPlaylistSymbol, IPlaylistService, IPlaylistState, IRssFeed, IRssItem, EPlaylistCommand, EFeedType } from '@christianriedl/media';
 
     const appState = inject(appStateSymbol)!;
     const getPlaylistService = inject(getPlaylistSymbol)!;
@@ -11,8 +11,11 @@
     const heightStyle = computed<StyleValue>(() => { return { height: appState.bodyHeight.value + 'px', overflowY: 'auto' } });
     const isMobile = appState.isMobile && (appState.device != EDevice.iPad);
     const router = useRouter();
+    const route = useRoute();
     const feeds: IRssFeed[] = reactive([]);
-    const selected = ref<IRssFeed|null>(null);
+    const items: IRssItem[] = reactive([]);
+    const selectedItem = ref<IRssItem|null>(null);
+    const selectedFeed = ref<IRssFeed|null>(null);
     const status = ref<IPlaylistState|null>(null);
     const audio = ref<HTMLAudioElement | null>(null);
     const listhead = ref<ComponentPublicInstance | null>(null);
@@ -22,27 +25,57 @@
     const playLocal = computed(() => currentPlayer.value == 'Local');
     const playIndex = ref(-1);
     const itemIndex = ref(0);
-    const playingFeed = ref<IRssFeed|null>(null);
+    const playingItem = ref<IRssItem|null>(null);
     const position = ref(0);
     const positionLength = ref(0);
     const volume = ref(0);
     const paused = ref(false);
+    const search = ref(true);
     let statusTimer = 0;
+    let volumeTimer = 0;
+    let volumeCount = 0;
 
+    const positionText = computed(() => {
+        if (playingItem.value?.duration) 
+            return toTime(position.value) + '/' + toTime(playingItem.value.duration);
+        else
+            return toTime(position.value);
+    });
 
+    const feedTypes = Helper.getEnumOptions(EFeedType);
+    const feedType = ref<EFeedType>(0);
+    const countries = ["", "AT", "DE", "US"];
+    const country = ref("");
+    const query = ref("");
+    const limit = ref(50);
 
     onMounted(async () => {
-        playlistService.log.info('OnlineBroadcast created');
-        const f = await playlistService.getFeeds();
-        feeds.splice(0, feeds.length, ...f);
-	computeListHeight();
+        playlistService.log.info('OnlinePodcastsPage created');
+	await start();
     });
     onUnmounted(() => {
 	if (statusTimer > 0) {
-	    clearTimeout(statusTimer);
+	    window.clearTimeout(statusTimer);
 	    statusTimer = 0;
 	}
     });
+    async function start() {
+        if (route.query?.rssUrl) {
+            const rssUrl = decodeURIComponent(route.query.rssUrl.toString());
+	    const f = await playlistService.getFeed(rssUrl);
+	    if (f && f.items) {
+		selectedFeed.value = f;
+		items.splice(0, items.length, ...f.items);
+		search.value = false;
+	    }
+        } 
+	else {
+	    search.value = true;
+        }
+        computeListHeight();
+    }
+    watch(appState.bodyHeight, () => computeListHeight());
+    watch(() => route.query, () => start());
 
     function computeListHeight() {
         nextTick(() => {
@@ -53,43 +86,69 @@
             listHeight.value = height;
         })
     }
+    async function onSearch() {
+	const dict: Dictionary<any> = {};
+	if (feedType.value != EFeedType.Unknown)
+	    dict["media"] = EFeedType[feedType.value];
+	if (country.value != "")
+	    dict["country"] = country.value;;
+	dict["query"] = query.value;
+	const fds = await playlistService.searchFeeds(dict, limit.value);
+	feeds.splice (0, feeds.length, ...fds);
+    }
     async function play() {
 	if (playLocal.value) {	
-	    audio.value!.src = selected.value!.link;
+	    audio.value!.src = selectedItem.value!.link;
 	    audio.value!.load();
 	    audio.value!.play().then(() => {  
-		playlistService.log.trace(`play local ${selected.value!.title}`)
+		playlistService.log.trace(`play local ${selectedItem.value!.title}`)
 	    });
+	    playingItem.value = selectedItem.value;	
 	}
 	else {
-	    const rc = await playlistService.play(selected.value!.link);    
+	    const rc = await playlistService.play(selectedItem.value!.link);    
 	    if (!rc) 
 		return;
+	    playingItem.value = selectedItem.value;	
 	    await getStatus();
-    	    playlistService.log.trace(`play remote ${selected.value!.title}`)
+    	    playlistService.log.trace(`play remote ${selectedItem.value!.title}`);
 	}
-	playingFeed.value = selected.value;	
-	itemIndex.value = playIndex.value = feeds.findIndex((f) => f.link == selected.value!.link);
+	itemIndex.value = playIndex.value = items.findIndex((f) => f.link == selectedItem.value!.link);
     }
-    function listItem(item: IRssFeed) {
-        selected.value = item;
-        computeListHeight();
+    function listFeed(feed: IRssFeed) {
+        router.push ({path: 'onlinePodcasts', query: { rssUrl: feed.rssUrl }});
+    }
+
+    function listItem(item: IRssItem) {
+	selectedItem.value = item;
+        play();
+	computeListHeight();
     }
     function listBack() {
         router.back();
     }
     async function getStatus() {
-	const status = await playlistService.getState();
-	status.value = status;
-	setPosition(status.position.toNumber());
-	statusTimer = setTimeout(async () => getStatus(), 1000);
+	const state = await playlistService.getState();
+	status.value = state;
+	if (state)
+	    setPosition(Number(state.position));
+	if (volumeCount > 0)
+	    volumeCount--;
+	else
+	    volume.value = playlistService.soundbarVolume;
+	statusTimer = window.setTimeout(async () => getStatus(), 1000);
     }
 
     function toSubTitle(f: IRssFeed): string {
-	if (!f.duration)
+	if (!f || !f.duration)
     	    return "";
-	let s = f.duration;
-        var r = "";
+	return toTime(f.duration);
+    }
+
+    function toTime(s?: number): string {
+	if (!s)
+	    return "";
+        let r = "";
         s = Math.floor(s);
         if (s >= 3600) {
             r += Math.floor(s / 3600).toString() + ":"; s = s % 3600;
@@ -116,8 +175,8 @@
     }
     function setPosition(value: number) {
         position.value = value;
-        if (playingFeed.value!.duration)
-            positionLength.value = position.value * 100 / playingFeed.value!.duration;
+        if (playingItem.value?.duration)
+            positionLength.value = position.value * 100 / playingItem.value!.duration;
         else
             positionLength.value = 0;
     }
@@ -127,7 +186,7 @@
             statusTimer = 0;
         }
         if (!playLocal.value) {
-            statusTimer = setTimeout(() => getStatus(), 1000);
+            statusTimer = window.setTimeout(() => getStatus(), 1000);
         }
     }
     function playpause() {
@@ -154,36 +213,143 @@
     function previous() {
         if (playIndex.value <= 0)
 	    return;
-	selected.value = feeds[playIndex.value - 1];
+	selectedItem.value = items[playIndex.value - 1];
         play();
     }
     function next() {
-        if (playIndex.value >= feeds.length - 1)
+        if (playIndex.value >= items.length - 1)
 	    return;
-	selected.value = feeds[playIndex.value + 1];
+	selectedItem.value = items[playIndex.value + 1];
         play();
     }
-    function changeVolume() {
+    async function stop() {
+        await playlistService.playCommand(EPlaylistCommand.Stop);
+    }
+    async function changeVolume() {
+        if (volumeTimer)
+            window.clearTimeout(volumeTimer);
+        
+	volumeCount = 3;
+        volumeTimer = window.setTimeout(async () => {
+	    await playlistService.setSoundbarVolume(volume.value);
+            volumeTimer = 0;
+        }, 500);
     }
 
 </script>
 
 <template>
     <v-card ref="listhead" class="bg-media_head">
+        <audio ref="audio" preload="none" @ended="onEnded" @timeupdate="onTimeUpdate">
+        </audio>
+	<v-container v-if="search" fluid>
+	    <v-row class="align-center">
+		<v-col cols="1"></v-col>
+		<v-col cols="2">Type</v-col>
+		<v-col cols="1">Country</v-col>
+		<v-col cols="6">Query</v-col>
+		<v-col cols="1">Limit</v-col>
+	    </v-row>
+	    <v-row class="align-center">
+		<v-col cols="1">
+		</v-col>
+		<v-col cols="2">
+		    <v-select density="compact" v-model="feedType"
+			:items="feedTypes"
+			persistent-hint hide-details single-line>
+		    </v-select>
+		</v-col>
+		<v-col cols="1">
+		    <v-combobox density="compact" v-model="country"
+			:items="countries"
+			persistent-hint hide-details single-line>
+		    </v-combobox>
+		</v-col>
+		<v-col cols="6">
+		    <v-text-field v-model="query" hide-details density="compact"></v-text-field>
+		</v-col>
+		<v-col cols="1">
+		    <v-text-field v-model="limit" hide-details type="number" density="compact"></v-text-field>
+		</v-col>
+		<v-col cols="1">
+		    <v-btn icon="$search" class="bg-media_head" variant="tonal" @click="onSearch">
+		    </v-btn>
+		</v-col>
+	    </v-row>
+	</v-container>
+	<v-container v-else fluid>
+	    <v-row class="align-center">
+		<v-col cols="1">
+		    <v-btn icon="$back" class="bg-media_head" variant="tonal" @click="listBack">
+		    </v-btn>
+		</v-col>
+		<v-col cols="1">
+                    <v-img :src="selectedFeed!.imageUrl"></v-img>
+		</v-col>
+		<v-col cols="1">{{selectedFeed!.country}}</v-col>
+		<v-col cols="2">{{selectedFeed!.genre}}</v-col>
+		<v-col cols="2">{{selectedFeed!.owner}}</v-col>
+		<v-col cols="4">{{selectedFeed!.title}}</v-col>
+		<v-col cols="1">
+		    <v-select v-model="currentPlayer" density="compact" :items="playerNames" persistent-hint
+				@update:modelValue="onPlayerChange" hide-details single-line>
+		    </v-select>
+		</v-col>
+	    </v-row>
+	    <v-row v-if="playingItem" class="align-center">
+		<v-col cols="4">
+		    <v-btn :icon="paused ? '$play' : '$pause'" class="bg-media_head" variant="tonal" @click="playpause"></v-btn>
+		    <v-btn v-if="!playLocal" icon="$stop" class="bg-media_head" variant="tonal" @click="stop"></v-btn>
+		    <v-btn icon="$prev" class="bg-media_head" variant="tonal" @click="previous"></v-btn>
+		    <v-btn icon="$next" class="bg-media_head" variant="tonal" @click="next"></v-btn>
+		</v-col>
+		<v-col cols ="8">
+		    <v-slider v-if="!playLocal" style="width:30%" color="red" track-color="blue" track-fill-color="red" v-model="volume" hide-details density="compact"
+			      min="0" max="100" step="5" @update:modelValue="changeVolume">
+		    </v-slider>
+		    <v-div v-else>{{playingItem.title}}</v-div>
+		</v-col>
+	    </v-row>
+	    <v-row v-if="playingItem">
+		<v-col cols="12">
+		    <v-progress-linear v-model="positionLength" color="blue" height="25"><strong>{{positionText}}</strong></v-progress-linear>
+		</v-col>
+	    </v-row>
+	</v-container>
+    </v-card>
+    <v-card :height="listHeight" density="compact" class="overflow-y-auto bg-media">
+	<v-container v-if="search" fluid>
+	    <v-row v-for="(feed,index) in feeds" :key="feed.rssUrl" @click="listFeed(feed)">
+		<v-col cols="1">{{feed.country}}</v-col>
+		<v-col cols="2">{{feed.genre}}</v-col>
+		<v-col cols="2">{{feed.owner}}</v-col>
+		<v-col cols="5">{{feed.title}}</v-col>
+	    </v-row>
+	</v-container>
+	<v-container v-else>
+	    <v-row v-for="(item,index) in items" :key="item.title" :class="{ active: index == playIndex }" @click="listItem(item)">
+		<v-col cols="6">{{item.title}}</v-col>
+		<v-col cols="6">{{toTime(item.duration)}}</v-col>
+	    </v-row>
+	</v-container>
+    </v-card>
+
+<!--
+    <v-card class="bg-media_head">
         <audio ref="audio" preload="none" @ended="onEnded" @timeupdate="onTimeUpdate">
         </audio>
         <v-list-item lines="three">
             <v-list-item-content>
-                <v-list-item-title text-h6>{{selected!.title}}</v-list-item-title>
+                <v-list-item-title text-h6>{{selected?.title}}</v-list-item-title>
                 <v-list-item-subtitle>{{toSubTitle(selected!)}}</v-list-item-subtitle>
             </v-list-item-content>
             <template v-slot:append>
-                <v-select v-model="currentPlayer"
+                <v-select v-model="currentPlayer" density="compact"
                             :items="playerNames"
                             persistent-hint
                             @update:modelValue="onPlayerChange"
                             hide-details single-line>
-                </v-select>!
+                </v-select>
             </template>
         </v-list-item>
         <v-card-actions>
@@ -209,11 +375,18 @@
     <v-card :height="listHeight" density="compact" class="overflow-y-auto bg-media">
         <v-list lines="two" class="bg-media">
             <v-list-item-group v-model="itemIndex">
-                <v-list-item v-for="(item,index) in items" :key="item.title" density="compact" :title="item.title" :subtitle="toSubTitle(item)"
-                             active-color="blue" :active="index == playIndex" @click="listItem(item)">
+                <v-list-item v-for="(feed,index) in feeds" :key="feed.title" density="compact" :title="feed.title" :subtitle="toSubTitle(feed)"
+                             active-color="blue" :active="index == playIndex" @click="listItem(feed)">
                 </v-list-item>
             </v-list-item-group>
         </v-list>
     </v-card>
+    -->
 </template>
 
+<style scoped>
+    .active {
+        background-color: aliceblue;
+    }
+
+</style>