Skip to content

Commit e496220

Browse files
authored
Merge pull request #142 from cyberjacob/extract-strings-pull
add strings that I thought had been moved to the HTSP library.
2 parents 883e5ad + dc2ab58 commit e496220

File tree

3 files changed

+10
-4
lines changed

3 files changed

+10
-4
lines changed

app/src/main/java/ie/macinnes/tvheadend/tvinput/ExoPlayerSession.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@
6363
import ie.macinnes.tvheadend.BuildConfig;
6464
import ie.macinnes.tvheadend.Constants;
6565
import ie.macinnes.tvheadend.MiscUtils;
66+
import ie.macinnes.tvheadend.R;
6667
import ie.macinnes.tvheadend.account.AccountUtils;
6768
import ie.macinnes.tvheadend.player.EventLogger;
6869
import ie.macinnes.tvheadend.player.ExoPlayerUtils;
@@ -183,15 +184,15 @@ public void onTracksChanged(TrackGroupArray trackGroups, TrackSelectionArray tra
183184
if (mappedTrackInfo != null) {
184185
if (mappedTrackInfo.getTrackTypeRendererSupport(C.TRACK_TYPE_VIDEO)
185186
== MappingTrackSelector.MappedTrackInfo.RENDERER_SUPPORT_UNSUPPORTED_TRACKS) {
186-
showToast("Unsupported Video Track Selected");
187+
showToast(mContext.getString(R.string.video_unsupported_error));
187188
}
188189
if (mappedTrackInfo.getTrackTypeRendererSupport(C.TRACK_TYPE_AUDIO)
189190
== MappingTrackSelector.MappedTrackInfo.RENDERER_SUPPORT_UNSUPPORTED_TRACKS) {
190-
showToast("Unsupported Audio Track Selected");
191+
showToast(mContext.getString(R.string.error_unsupported_audio));
191192
}
192193
if (mappedTrackInfo.getTrackTypeRendererSupport(C.TRACK_TYPE_TEXT)
193194
== MappingTrackSelector.MappedTrackInfo.RENDERER_SUPPORT_UNSUPPORTED_TRACKS) {
194-
showToast("Unsupported Text Track Selected");
195+
showToast(mContext.getString(R.string.error_unsupported_text));
195196
}
196197
}
197198

app/src/main/java/ie/macinnes/tvheadend/tvinput/MediaPlayerSession.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030

3131
import ie.macinnes.tvheadend.Constants;
3232
import ie.macinnes.tvheadend.MiscUtils;
33+
import ie.macinnes.tvheadend.R;
3334
import ie.macinnes.tvheadend.account.AccountUtils;
3435

3536
public class MediaPlayerSession extends BaseSession {
@@ -106,7 +107,7 @@ protected boolean playChannel(int tvhChannelId) {
106107

107108
return true;
108109
} else {
109-
Toast.makeText(mContext, "Failed to prepare video", Toast.LENGTH_SHORT).show();
110+
Toast.makeText(mContext, R.string.error_prepare_video, Toast.LENGTH_SHORT).show();
110111

111112
return false;
112113
}

app/src/main/res/values/strings.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,4 +83,8 @@ under the License.
8383
<string name="mediaplayer_title">Media Player</string>
8484
<string name="VLC_body">VideoLAN LibVLC (Deprecated)</string>
8585
<string name="VLC_title">LibVLC</string>
86+
<string name="video_unsupported_error">Unsupported Video Track Selected</string>
87+
<string name="error_unsupported_audio">Unsupported Audio Track Selected</string>
88+
<string name="error_unsupported_text">Unsupported Text Track Selected</string>
89+
<string name="error_prepare_video">Failed to prepare video</string>
8690
</resources>

0 commit comments

Comments
 (0)