Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Already on GitHub? Sign in to your account

Ported over subtitle font-detection code from transcoder #7

Closed
wants to merge 2 commits into
from

Conversation

Projects
None yet
2 participants

rcombs commented Sep 30, 2013

Compiled, tested, huzzah.

@tru tru commented on an outdated diff Oct 1, 2013

xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp
@@ -48,6 +48,7 @@
#include "threads/SystemClock.h"
#include "utils/TimeUtils.h"
#include "URL.h"
+#include <string>
@tru

tru Oct 1, 2013

Owner

Move this down under the /* PLEX */ comment. We need to make sure that all code that we change are marked in this way, otherwise it will make resync with XBMC a living hell later on.

@tru tru commented on an outdated diff Oct 1, 2013

xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp
@@ -1133,20 +1134,32 @@ void CDVDDemuxFFmpeg::AddStream(int iId)
}
case AVMEDIA_TYPE_ATTACHMENT:
{ //mkv attachments. Only bothering with fonts for now.
+ int found = 0;
@tru

tru Oct 1, 2013

Owner

Add /* PLEX / / END PLEX */ here.

@tru tru commented on the diff Oct 1, 2013

xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp
if(pStream->codec->codec_id == CODEC_ID_TTF
#if (!defined USE_EXTERNAL_FFMPEG)
|| pStream->codec->codec_id == CODEC_ID_OTF
#endif
)
{
- std::string fileName = "special://temp/fonts/";
@tru

tru Oct 1, 2013

Owner

Instead of deleting code like this, please do #ifndef PLEX #else #endif
also because it makes it easier to resync in the future.

@rcombs

rcombs Oct 2, 2013

I am not sure how to arrange this effectively.

Owner

tru commented Oct 1, 2013

Thanks for the pull request, this looks like a much better patch than the things in ffmpeg, I have left some comments on how to format the code better for inclusion in our tree.

tru pushed a commit that referenced this pull request May 19, 2014

Merge pull request #7 from RasPlex/playlist
Adding OE/Rasplex specific menus for LeftSide Menu

@tru tru closed this Jan 26, 2015

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment