Skip to content
This repository has been archived by the owner on Sep 30, 2021. It is now read-only.

Commit

Permalink
Update demo video server location
Browse files Browse the repository at this point in the history
  • Loading branch information
@phloxic @nnarhinen
phloxic authored and nnarhinen committed Jan 11, 2017
1 parent bd3e691 commit 016bd17
Show file tree
Hide file tree
Showing 26 changed files with 84 additions and 84 deletions.
4 changes: 2 additions & 2 deletions README.md
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@

# Flowplayer

[website](http://flowplayer.org) | [demos](http://flowplayer.org/demos/) | [docs](http://flowplayer.org/docs/)
[website](https://flowplayer.org) | [demos](https://flowplayer.org/demos/) | [docs](https://flowplayer.org/docs/)

## For the impatient

1. [Download Flowplayer](http://flowplayer.org/latest)
1. [Download Flowplayer](https://flowplayer.org/latest)
2. Unzip
3. Drop the folder under your server

Expand Down
6 changes: 3 additions & 3 deletions features/basics.feature
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ Feature: Basic setup
"""html
<div class="flowplayer" data-ratio="0.4167">
<video>
<source type="video/webm" src="http://stream.flowplayer.org/bauhaus.webm">
<source type="video/mp4" src="http://stream.flowplayer.org/bauhaus.mp4">
<source type="video/ogg" src="http://stream.flowplayer.org/bauhaus.ogv">
<source type="video/webm" src="http://edge.flowplayer.org/bauhaus.webm">
<source type="video/mp4" src="http://edge.flowplayer.org/bauhaus.mp4">
<source type="video/ogg" src="http://edge.flowplayer.org/bauhaus.ogv">
</video>
</div>
"""
Expand Down
6 changes: 3 additions & 3 deletions features/cuepoints.feature
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ Feature: Cuepoints
"""html
<div class="flowplayer" data-ratio="0.4167">
<video>
<source type="video/webm" src="http://stream.flowplayer.org/bauhaus/624x260.webm">
<source type="video/mp4" src="http://stream.flowplayer.org/bauhaus/624x260.mp4">
<source type="video/ogg" src="http://stream.flowplayer.org/bauhaus/624x260.ogv">
<source type="video/webm" src="http://edge.flowplayer.org/bauhaus/624x260.webm">
<source type="video/mp4" src="http://edge.flowplayer.org/bauhaus/624x260.mp4">
<source type="video/ogg" src="http://edge.flowplayer.org/bauhaus/624x260.ogv">
</video>
</div>
<div class="cuepoint-count"></div>
Expand Down
6 changes: 3 additions & 3 deletions features/events.feature
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ Feature: Events
"""html
<div class="flowplayer" data-ratio="0.4167">
<video>
<source type="video/webm" src="http://stream.flowplayer.org/bauhaus/624x260.webm">
<source type="video/mp4" src="http://stream.flowplayer.org/bauhaus/624x260.mp4">
<source type="video/ogg" src="http://stream.flowplayer.org/bauhaus/624x260.ogv">
<source type="video/webm" src="http://edge.flowplayer.org/bauhaus/624x260.webm">
<source type="video/mp4" src="http://edge.flowplayer.org/bauhaus/624x260.mp4">
<source type="video/ogg" src="http://edge.flowplayer.org/bauhaus/624x260.ogv">
</video>
</div>
<table>
Expand Down
6 changes: 3 additions & 3 deletions features/playback.feature
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ Feature: Playback
"""html
<div class="flowplayer" data-ratio="0.4167">
<video>
<source type="video/webm" src="http://stream.flowplayer.org/bauhaus.webm">
<source type="video/mp4" src="http://stream.flowplayer.org/bauhaus.mp4">
<source type="video/ogg" src="http://stream.flowplayer.org/bauhaus.ogv">
<source type="video/webm" src="http://edge.flowplayer.org/bauhaus.webm">
<source type="video/mp4" src="http://edge.flowplayer.org/bauhaus.mp4">
<source type="video/ogg" src="http://edge.flowplayer.org/bauhaus.ogv">
</video>
</div>
<script>
Expand Down
4 changes: 2 additions & 2 deletions index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
<!-- the player -->
<div class="flowplayer" data-swf="flowplayer.swf" data-ratio="0.4167">
<video>
<source type="video/webm" src="https://stream.flowplayer.org/bauhaus.webm">
<source type="video/mp4" src="https://stream.flowplayer.org/bauhaus.mp4">
<source type="video/webm" src="https://edge.flowplayer.org/bauhaus.webm">
<source type="video/mp4" src="https://edge.flowplayer.org/bauhaus.mp4">
</video>
</div>

Expand Down
2 changes: 1 addition & 1 deletion test/analytics.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

<div class="player" title="The black video"
data-engine="flash" data-swf="../dist/flowplayer.swf">
<video src="http://stream.flowplayer.org/black/470x250.mp4"></video>
<video src="http://edge.flowplayer.org/black/470x250.mp4"></video>
</div>

<button>joo</button>
Expand Down
10 changes: 5 additions & 5 deletions test/configuration-object.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,21 +38,21 @@
"sources": [
{
"type": "video/webm",
"src": "http://stream.flowplayer.org/bauhaus/624x260.webm"
"src": "http://edge.flowplayer.org/bauhaus/624x260.webm"
},
{
"type": "video/mp4",
"src": "http://stream.flowplayer.org/bauhaus/624x260.mp4"
"src": "http://edge.flowplayer.org/bauhaus/624x260.mp4"
}
]
}
}
</script>
<noscript>
<video>
<source type="video/mp4" src="http://stream.flowplayer.org/bauhaus/624x260.mp4"/>
<source type="video/webm" src="http://stream.flowplayer.org/bauhaus/624x260.webm"/>
<source type="video/ogg" src="http://stream.flowplayer.org/bauhaus/624x260.ogv"/>
<source type="video/mp4" src="http://edge.flowplayer.org/bauhaus/624x260.mp4"/>
<source type="video/webm" src="http://edge.flowplayer.org/bauhaus/624x260.webm"/>
<source type="video/ogg" src="http://edge.flowplayer.org/bauhaus/624x260.ogv"/>
</video>
</noscript>
</div>
Expand Down
2 changes: 1 addition & 1 deletion test/cuepoints.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
<body>

<div id="player" class="aside-controls">
<video src="http://stream.flowplayer.org/black/470x250.webm"></video>
<video src="http://edge.flowplayer.org/black/470x250.webm"></video>
<div class="roll" id="roll1">ROLL #1</div>
<div class="roll" id="roll2">ROLL #2</div>
<div class="roll" id="roll5">ROLL #5</div>
Expand Down
2 changes: 1 addition & 1 deletion test/flashonly.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
// ../../player-commercial/dist/flowplayer.swf
$(function() {
var objectTag = embed('../dist/flowplayer.swf',
{ url: 'http://stream.flowplayer.org/bauhaus.mp4',
{ url: 'http://edge.flowplayer.org/bauhaus.mp4',
autoplay: true,
flashUi: true
}
Expand Down
30 changes: 15 additions & 15 deletions test/grid-playlist.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -168,29 +168,29 @@ <h1>Flowplayer · Grid playlist</h1>
sources: [
{
type: 'application/x-mpegurl',
src:'http://stream.flowplayer.org/night1.m3u8'
src:'http://edge.flowplayer.org/night1.m3u8'
},{
type: 'video/webm',
src:'http://stream.flowplayer.org/night1.webm'
src:'http://edge.flowplayer.org/night1.webm'
},{
type: 'video/mp4',
src: 'http://stream.flowplayer.org/night1.mp4'
src: 'http://edge.flowplayer.org/night1.mp4'
}
]
},
playlist: [
'http://stream.flowplayer.org/night1.mp4',
'http://stream.flowplayer.org/night2.mp4',
'http://stream.flowplayer.org/night3.mp4',
'http://stream.flowplayer.org/night4.mp4',
'http://stream.flowplayer.org/night5.mp4',
'http://stream.flowplayer.org/night6.mp4',
'http://stream.flowplayer.org/night1.mp4',
'http://stream.flowplayer.org/night2.mp4',
'http://stream.flowplayer.org/night3.mp4',
'http://stream.flowplayer.org/night4.mp4',
'http://stream.flowplayer.org/night5.mp4',
'http://stream.flowplayer.org/night6.mp4']
'http://edge.flowplayer.org/night1.mp4',
'http://edge.flowplayer.org/night2.mp4',
'http://edge.flowplayer.org/night3.mp4',
'http://edge.flowplayer.org/night4.mp4',
'http://edge.flowplayer.org/night5.mp4',
'http://edge.flowplayer.org/night6.mp4',
'http://edge.flowplayer.org/night1.mp4',
'http://edge.flowplayer.org/night2.mp4',
'http://edge.flowplayer.org/night3.mp4',
'http://edge.flowplayer.org/night4.mp4',
'http://edge.flowplayer.org/night5.mp4',
'http://edge.flowplayer.org/night6.mp4']
});
</script>
</body>
Expand Down
2 changes: 1 addition & 1 deletion test/init/autoplay.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<body>

<div class="flowplayer" data-debug="flash" data-engine="flash" data-swf="../../dist/flowplayer.swf">
<video src="http://stream.flowplayer.org/black/470x250.mp4" autoplay></video>
<video src="http://edge.flowplayer.org/black/470x250.mp4" autoplay></video>
</div>

</body>
2 changes: 1 addition & 1 deletion test/init/frame1.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<body>

<div class="flowplayer" data-engine="html5" data-debug="true" data-swf="../../dist/flowplayer.swf">
<video src="http://stream.flowplayer.org/black/470x250.mp4"></video>
<video src="http://edge.flowplayer.org/black/470x250.mp4"></video>
</div>

</body>
2 changes: 1 addition & 1 deletion test/init/js-setup.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<div data-ratio="0.75" class='fp fixed-controls' style='width:640px;height:480px;'>
<video>
<!--<source src='470x250.mp4' type='video/mp4' />-->
<source src='http://stream.flowplayer.org/black/470x250.mp4' type='video/mp4' />
<source src='http://edge.flowplayer.org/black/470x250.mp4' type='video/mp4' />
</video>
</div>

Expand Down
2 changes: 1 addition & 1 deletion test/init/poster-rtmp.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
data-debug="true" data-rtmp="rtmp://s3b78u0kbtx79q.cloudfront.net/cfx/st">

<video poster="camera.jpg">
<!--<source type="video/mp4" src="http://stream.flowplayer.org/buffalo_soldiers.mp4">-->
<!--<source type="video/mp4" src="http://edge.flowplayer.org/buffalo_soldiers.mp4">-->
<source type="video/flash" src="mp4:buffalo_soldiers.mp4">
</video>
</div>
Expand Down
2 changes: 1 addition & 1 deletion test/init/poster.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

<div class="flowplayer" data-engine="flash" data-swf="../../dist/flowplayer.swf?a=2"
data-debug="true">
<video src="http://stream.flowplayer.org/black/470x250.mp4" poster="camera.jpg"></video>
<video src="http://edge.flowplayer.org/black/470x250.mp4" poster="camera.jpg"></video>
</div>

</body>
2 changes: 1 addition & 1 deletion test/init/splash.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<body>

<div class="flowplayer is-splash" data-engine="flash" data-swf="../../dist/flowplayer.swf">
<video src="http://stream.flowplayer.org/black/470x250.mp4"></video>
<video src="http://edge.flowplayer.org/black/470x250.mp4"></video>
</div>

</body>
6 changes: 3 additions & 3 deletions test/ipad-poster.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@

<div class="flowplayer is-closeable -is-splash -no-toggle" data-debug="true" data-ratio=".4167">
<video controls poster="init/camera.jpg">
<source type="video/webm" src="http://stream.flowplayer.org/playful.webm">
<source type="video/mp4" src="http://stream.flowplayer.org/playful.mp4">
<source type="video/ogv" src="http://stream.flowplayer.org/playful.ogv">
<source type="video/webm" src="http://edge.flowplayer.org/playful.webm">
<source type="video/mp4" src="http://edge.flowplayer.org/playful.mp4">
<source type="video/ogv" src="http://edge.flowplayer.org/playful.ogv">
</video>
</div>

Expand Down
6 changes: 3 additions & 3 deletions test/ipad.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@

<div class="flowplayer is-closeable -is-splash -no-toggle" data-debug="true" data-ratio=".4167">
<video controls>
<source type="video/webm" src="http://stream.flowplayer.org/playful.webm">
<source type="video/mp4" src="http://stream.flowplayer.org/playful.mp4">
<source type="video/ogv" src="http://stream.flowplayer.org/playful.ogv">
<source type="video/webm" src="http://edge.flowplayer.org/playful.webm">
<source type="video/mp4" src="http://edge.flowplayer.org/playful.mp4">
<source type="video/ogv" src="http://edge.flowplayer.org/playful.ogv">
</video>
</div>

Expand Down
2 changes: 1 addition & 1 deletion test/js-flash-live-playlist.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
sources: [
{
type: "video/flash",
src: "http://stream.flowplayer.org/flowplayer-700.flv"
src: "http://edge.flowplayer.org/flowplayer-700.flv"
}]
}, {
rtmp: "rtmp://itv08.digizuite.dk/tv2b",
Expand Down
18 changes: 9 additions & 9 deletions test/js-setup-playlist-cuepoints.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,42 +49,42 @@
sources: [
{
type: "video/webm",
src: "http://stream.flowplayer.org/bauhaus/624x260.webm"
src: "http://edge.flowplayer.org/bauhaus/624x260.webm"
},
{
type: "video/mp4",
src: "http://stream.flowplayer.org/bauhaus/624x260.mp4"
src: "http://edge.flowplayer.org/bauhaus/624x260.mp4"
}
],
cuepoints: [1.2, 2.4, 5, 9]
}, {
sources: [
{
type: "video/flash",
src: "http://stream.flowplayer.org/flowplayer-700.flv"
src: "http://edge.flowplayer.org/flowplayer-700.flv"
}]
}, {
preload: "none",
sources: [
{
type: "video/webm",
src: "http://stream.flowplayer.org/night1.webm"
src: "http://edge.flowplayer.org/night1.webm"
},
{
type: "video/mp4",
src: "http://stream.flowplayer.org/night1.mp4"
src: "http://edge.flowplayer.org/night1.mp4"
}
]
}, {
preload: "none",
sources: [
{
type: "video/webm",
src: "http://stream.flowplayer.org/night3.webm"
src: "http://edge.flowplayer.org/night3.webm"
},
{
type: "video/mp4",
src: "http://stream.flowplayer.org/night3.mp4"
src: "http://edge.flowplayer.org/night3.mp4"
}
],
cuepoints: [2, 5, 9]
Expand All @@ -93,11 +93,11 @@
sources: [
{
type: "video/webm",
src: "http://stream.flowplayer.org/night4.webm"
src: "http://edge.flowplayer.org/night4.webm"
},
{
type: "video/mp4",
src: "http://stream.flowplayer.org/night4.mp4"
src: "http://edge.flowplayer.org/night4.mp4"
}
]
}]
Expand Down
12 changes: 6 additions & 6 deletions test/js-setup-playlist.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,18 +42,18 @@
sources: [
{
type: "video/webm",
src: "http://stream.flowplayer.org/bauhaus/624x260.webm"
src: "http://edge.flowplayer.org/bauhaus/624x260.webm"
},
{
type: "video/mp4",
src: "http://stream.flowplayer.org/bauhaus/624x260.mp4"
src: "http://edge.flowplayer.org/bauhaus/624x260.mp4"
}
]
}, {
sources: [
{
type: "video/flash",
src: "http://stream.flowplayer.org/flowplayer-700.flv"
src: "http://edge.flowplayer.org/flowplayer-700.flv"
}]
}, {
preload: "none",
Expand All @@ -69,19 +69,19 @@
sources: [
{
type: "application/x-mpegurl",
src: "http://stream.flowplayer.org/functional.m3u8"
src: "http://edge.flowplayer.org/functional.m3u8"
}
]
}, {
preload: "none",
sources: [
{
type: "video/webm",
src: "http://stream.flowplayer.org/night4.webm"
src: "http://edge.flowplayer.org/night4.webm"
},
{
type: "video/mp4",
src: "http://stream.flowplayer.org/night4.mp4"
src: "http://edge.flowplayer.org/night4.mp4"
}
]
}]
Expand Down
4 changes: 2 additions & 2 deletions test/js-setup.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,11 @@
sources: [
{
type: "video/webm",
src: "http://stream.flowplayer.org/bauhaus/624x260.webm"
src: "http://edge.flowplayer.org/bauhaus/624x260.webm"
},
{
type: "video/mp4",
src: "http://stream.flowplayer.org/bauhaus/624x260.mp4"
src: "http://edge.flowplayer.org/bauhaus/624x260.mp4"
}
]
}
Expand Down
Loading

0 comments on commit 016bd17

Please sign in to comment.