Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion README
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
TVHGuide is an Android application that enables you to interact with a
TVHeadend server. It allows you to browse programme listings, schedual
TVHeadend server. It allows you to browse programme listings, schedule
recordings and search the EPG. Depending on your hardware, it can also
do some actual playback of either live TV or a recorded stream.

Expand Down
2 changes: 1 addition & 1 deletion res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
<string name="pref_scodec_sum">Subtitle codec to use with the transcoder</string>

<string name="pref_container">Media container</string>
<string name="pref_container_sum">Prefered media container</string>
<string name="pref_container_sum">Preferred media container</string>

<string name="pref_playback">Playback</string>

Expand Down
2 changes: 1 addition & 1 deletion src/org/tvheadend/tvhguide/SettingsActivity.java
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ protected void onPause() {
reconnect |= !oldPw.equals(prefs.getString("passwordPref", ""));

if (reconnect) {
Log.d("SettingsActivity", "Connectivity settings chaned, forcing a reconnect");
Log.d("SettingsActivity", "Connectivity settings changed, forcing a reconnect");
Intent intent = new Intent(SettingsActivity.this, HTSService.class);
intent.setAction(HTSService.ACTION_CONNECT);
intent.putExtra("hostname", prefs.getString("serverHostPref", ""));
Expand Down
2 changes: 1 addition & 1 deletion src/org/tvheadend/tvhguide/htsp/HTSMessage.java
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ public static HTSMessage parse(ByteBuffer buf) throws IOException {

if (len + 4 > buf.capacity()) {
buf.clear();
throw new IOException("Mesage is to long");
throw new IOException("Message is to long");
}

if (buf.limit() == 4) {
Expand Down
4 changes: 2 additions & 2 deletions src/org/tvheadend/tvhguide/htsp/SelectionThread.java
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ private void select(int timeout) {
}

private void processTcpSelectionKey(SelectionKey selKey) {
//Incomming connection established
//Incoming connection established
if (selKey.isValid() && selKey.isAcceptable()) {
try {
ServerSocketChannel ssChannel = (ServerSocketChannel) selKey.channel();
Expand Down Expand Up @@ -214,7 +214,7 @@ private void processTcpSelectionKey(SelectionKey selKey) {
}
}

//Incomming data
//Incoming data
if (selKey.isValid() && selKey.isReadable()) {
SocketChannel sChannel = (SocketChannel) selKey.channel();
try {
Expand Down