mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-23 12:10:06 +02:00
StreamRadio: fix build
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
From fc2ddfbd9a097be2556736607a0f23947eab3cd3 Mon Sep 17 00:00:00 2001
|
||||
From 83cbf56850dd3d0c25d5b31b90aab48d20645b99 Mon Sep 17 00:00:00 2001
|
||||
From: Humdinger <humdingerb@gmail.com>
|
||||
Date: Sun, 27 Aug 2017 18:50:54 +0200
|
||||
Subject: Rename to "StreamRadio"
|
||||
@@ -4362,10 +4362,10 @@ index 9b20d3a..088d4c5 100644
|
||||
StationsList::StationsList()
|
||||
: BObjectList<Station>()
|
||||
--
|
||||
2.19.0
|
||||
2.19.1
|
||||
|
||||
|
||||
From dfc07d50eb18c3b2a2fac12fa420f489c35aab13 Mon Sep 17 00:00:00 2001
|
||||
From c1272dcfece423cb143be42ba769beec023cb5a2 Mon Sep 17 00:00:00 2001
|
||||
From: Alex Hitech <ahitech@gmail.com>
|
||||
Date: Tue, 2 Oct 2018 13:41:04 +0300
|
||||
Subject: Corrected stations' background
|
||||
@@ -4385,5 +4385,102 @@ index 6e37365..1ed71d9 100644
|
||||
BRect target(SLV_INSET, SLV_INSET, SLV_HEIGHT - 2 * SLV_INSET, SLV_HEIGHT - 2 * SLV_INSET);
|
||||
target.OffsetBy(frame.LeftTop());
|
||||
--
|
||||
2.19.0
|
||||
2.19.1
|
||||
|
||||
|
||||
From c30b522de4774c5c2e7022eb958f944bcad2945e Mon Sep 17 00:00:00 2001
|
||||
From: Alex Hitech <ahitech@gmail.com>
|
||||
Date: Mon, 11 Mar 2019 02:12:05 +0200
|
||||
Subject: Fixing application by adding codec sources and linking to codec lib.
|
||||
|
||||
|
||||
diff --git a/MainWindow.cpp b/MainWindow.cpp
|
||||
index e5ae72d..c88fda2 100644
|
||||
--- a/MainWindow.cpp
|
||||
+++ b/MainWindow.cpp
|
||||
@@ -28,6 +28,8 @@
|
||||
#include <Autolock.h>
|
||||
#include <ScrollView.h>
|
||||
#include <LayoutBuilder.h>
|
||||
+#include <GroupLayout.h>
|
||||
+#include <Dragger.h>
|
||||
|
||||
MainWindow::MainWindow()
|
||||
: BWindow(BRect(0,0,400,200), "StreamRadio", B_DOCUMENT_WINDOW, B_WILL_ACCEPT_FIRST_CLICK),
|
||||
@@ -56,7 +58,7 @@ MainWindow::MainWindow()
|
||||
fStationPanel = new StationPanel(this);
|
||||
fExpander = new Expander("expStationPanel", fStationPanel);
|
||||
|
||||
- BLayoutBuilder::Group<>(this, B_VERTICAL, 0)
|
||||
+ BGroupLayout* layout = (BGroupLayout *)BLayoutBuilder::Group<>(this, B_VERTICAL, 0)
|
||||
.SetExplicitAlignment(BAlignment(B_ALIGN_USE_FULL_WIDTH, B_ALIGN_USE_FULL_HEIGHT))
|
||||
.Add(stationScroll, 1.0f)
|
||||
.Add(fExpander, 0.0f)
|
||||
diff --git a/Makefile b/Makefile
|
||||
index ed14628..e07b003 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -79,7 +79,7 @@ RSRCS =
|
||||
# - if your library does not follow the standard library naming scheme,
|
||||
# you need to specify the path to the library and it's name.
|
||||
# (e.g. for mylib.a, specify "mylib.a" or "path/mylib.a")
|
||||
-LIBS = $(STDCPPLIBS) be translation bnetapi media xml2
|
||||
+LIBS = $(STDCPPLIBS) be codec translation bnetapi media xml2
|
||||
|
||||
# Specify additional paths to directories following the standard libXXX.so
|
||||
# or libXXX.a naming scheme. You can specify full paths or paths relative
|
||||
@@ -92,6 +92,7 @@ LIBPATHS =
|
||||
# "#include <header>". Directories that contain the files in SRCS are
|
||||
# NOT auto-included here.
|
||||
SYSTEM_INCLUDE_PATHS = /boot/system/develop/headers/private/media \
|
||||
+ /boot/system/develop/headers/os/codec \
|
||||
/boot/system/develop/headers/private/media/experimental \
|
||||
/boot/system/develop/headers/private/shared \
|
||||
/boot/system/develop/headers/libxml2
|
||||
diff --git a/StreamIO.cpp b/StreamIO.cpp
|
||||
index 731737e..f786193 100644
|
||||
--- a/StreamIO.cpp
|
||||
+++ b/StreamIO.cpp
|
||||
@@ -24,9 +24,11 @@
|
||||
#include "Station.h"
|
||||
#include "Debug.h"
|
||||
#include "StreamIO.h"
|
||||
+#include "MediaIO.h"
|
||||
#define __USE_GNU
|
||||
#include <regex.h>
|
||||
|
||||
+using namespace BCodecKit;
|
||||
|
||||
#define HTTP_TIMEOUT 30000000
|
||||
|
||||
diff --git a/StreamIO.h b/StreamIO.h
|
||||
index 990b82b..e272ce7 100644
|
||||
--- a/StreamIO.h
|
||||
+++ b/StreamIO.h
|
||||
@@ -38,6 +38,9 @@
|
||||
class Station;
|
||||
class StreamIO;
|
||||
|
||||
+using BCodecKit::BAdapterIO;
|
||||
+using BCodecKit::BInputAdapter;
|
||||
+
|
||||
typedef void (StreamIO::*DataFunc)(BUrlRequest* request,
|
||||
const char* data,
|
||||
off_t position, ssize_t size,
|
||||
diff --git a/StreamPlayer.h b/StreamPlayer.h
|
||||
index d5fddf6..761341a 100644
|
||||
--- a/StreamPlayer.h
|
||||
+++ b/StreamPlayer.h
|
||||
@@ -9,6 +9,9 @@
|
||||
#define STREAMPLAYER_H
|
||||
//#include <MediaExtractor.h>
|
||||
//#include <DecoderPlugin.h>
|
||||
+
|
||||
+
|
||||
+#include <MediaIO.h>
|
||||
#include <SoundPlayer.h>
|
||||
#include <MediaFile.h>
|
||||
#include "Station.h"
|
||||
--
|
||||
2.19.1
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@ streams."
|
||||
HOMEPAGE="https://github.com/fishpond-haiku/Haiku-Radio"
|
||||
COPYRIGHT="2017 Kai Niessen"
|
||||
LICENSE="MIT"
|
||||
REVISION="2"
|
||||
REVISION="3"
|
||||
srcGitRev="26f3bbda29da165c849d246038af98e17270249c"
|
||||
SOURCE_URI="https://github.com/fishpond-haiku/Haiku-Radio/archive/$srcGitRev.tar.gz"
|
||||
CHECKSUM_SHA256="05a015706082618e7282db537852aa697b949cb1a34f698733d0b69131938d3b"
|
||||
|
||||
Reference in New Issue
Block a user