From 12845ab18c4e5333d6f1d675f59f6136eccace59 Mon Sep 17 00:00:00 2001 From: martii Date: Wed, 16 Apr 2014 17:26:53 +0200 Subject: [PATCH] libeplayer3: minor adjustments --- libeplayer3/include/manager.h | 2 +- libeplayer3/input.cpp | 6 +++--- libeplayer3/player.cpp | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libeplayer3/include/manager.h b/libeplayer3/include/manager.h index 655ee72..2442b5c 100644 --- a/libeplayer3/include/manager.h +++ b/libeplayer3/include/manager.h @@ -42,7 +42,7 @@ class Player; struct Track { - std::string Name; + std::string title; int pid; int64_t duration; AVFormatContext *avfc; diff --git a/libeplayer3/input.cpp b/libeplayer3/input.cpp index 873ab21..1e8fcc6 100644 --- a/libeplayer3/input.cpp +++ b/libeplayer3/input.cpp @@ -328,7 +328,7 @@ bool Input::ReadSubtitle(const char *filename, const char *format, int pid) avformat_free_context(subavfc); Track track; - track.Name = format; + track.title = format; track.is_static = 1; track.pid = pid; player->manager.addSubtitleTrack(track); @@ -434,7 +434,7 @@ bool Input::UpdateTracks() track.avfc = avfc; track.stream = stream; AVDictionaryEntry *lang = av_dict_get(stream->metadata, "language", NULL, 0); - track.Name = lang ? lang->value : ""; + track.title = lang ? lang->value : ""; track.pid = stream->id; if (stream->duration == AV_NOPTS_VALUE) track.duration = avfc->duration; @@ -483,7 +483,7 @@ bool Input::UpdateTracks() int size = stream->codec->extradata_size; if (size > 0 && 2 * size - 1 == (int) l.length()) for (int i = 0; i < size; i += 2) { - track.Name = l.substr(i * 2, 3); + track.title = l.substr(i * 2, 3); track.type = data[i] >> 3; track.mag = data[i] & 7; track.page = data[i + 1]; diff --git a/libeplayer3/player.cpp b/libeplayer3/player.cpp index 88a446a..48f4d2c 100644 --- a/libeplayer3/player.cpp +++ b/libeplayer3/player.cpp @@ -52,7 +52,7 @@ void *Player::playthread(void *arg) char threadname[17]; strncpy(threadname, __func__, sizeof(threadname)); threadname[16] = 0; - prctl(PR_SET_NAME, (unsigned long) &threadname); + prctl(PR_SET_NAME, (unsigned long) threadname); Player *player = (Player *) arg; player->hasThreadStarted = true;