Skip to content
This repository was archived by the owner on Jan 31, 2018. It is now read-only.

[#3219] Old media comes with a better title. #1661

Open
ScottDowne wants to merge 2 commits into
base: master
Choose a base branch
from
Open

[#3219] Old media comes with a better title. #1661

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
22a2551
[#3219] Old media comes with a better title.
ScottDowne Apr 9, 2013
cf0674e
[#3219] Removed random paste that was not intended.
ScottDowne Apr 10, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 20 additions & 16 deletions public/src/core/media.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -597,30 +597,34 @@
if ( importData.url && _duration >= 0 ) {
var firstSource;

// If sources is a single array and of type null player, don't bother making a sequence.
// If sources is a single array and of type null player,
// don't bother making a sequence.
if ( url.length > 1 || MediaTypes.checkUrl( url[ 0 ] ) !== "null" ) {
// grab first source as main source.
sources.push( URI.makeUnique( url.shift() ).toString() );
for ( i = 0; i < url.length; i++ ) {
fallbacks.push( URI.makeUnique( url[ i ] ).toString() );
fallbacks.pusgetMetaDatah( URI.makeUnique( url[ i ] ).toString() );

@mjschranz mjschranz Apr 10, 2013

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Heh.

}

firstSource = sources[ 0 ];
newTrack = new Track();
_this.addTrack( newTrack );
newTrack.addTrackEvent({
type: "sequencer",
popcornOptions: {
start: 0,
end: _duration,
source: sources,
title: URI.stripUnique( firstSource ).path,
fallback: fallbacks,
duration: _duration,
target: "video-container"
}
MediaTypes.getMetaData( firstSource, function( data ) {

newTrack = new Track();
_this.addTrack( newTrack );
newTrack.addTrackEvent({
type: "sequencer",
popcornOptions: {
start: 0,
end: _duration,
source: sources,
title: data.title,
fallback: fallbacks,
duration: _duration,
target: "video-container"
}
});
_clipData[ firstSource ] = firstSource;
});
_clipData[ firstSource ] = firstSource;
}
}
} else if ( console ) {
Expand Down