moonlight-stream/moonlight-android
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-android.git synced 2025-07-20 03:23:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update limelight-android for limelight-common changes

Browse Source
This commit is contained in:
Cameron Gutman 2013-12-19 04:43:42 -05:00
parent 12179a999b
commit 934e234b74
2 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
libs/limelight-common.jar
View File

Binary file not shown.

27
src/com/limelight/Game.java
View File

@ -3,6 +3,7 @@ package com.limelight;
import com.limelight.binding.PlatformBinding; import com.limelight.binding.PlatformBinding;
import com.limelight.nvstream.NvConnection; import com.limelight.nvstream.NvConnection;
import com.limelight.nvstream.NvConnectionListener; import com.limelight.nvstream.NvConnectionListener;
import com.limelight.nvstream.StreamConfiguration;
import com.limelight.nvstream.av.video.VideoDecoderRenderer; import com.limelight.nvstream.av.video.VideoDecoderRenderer;
import com.limelight.nvstream.input.ControllerPacket; import com.limelight.nvstream.input.ControllerPacket;
import com.limelight.utils.Dialog; import com.limelight.utils.Dialog;
@ -46,7 +47,15 @@ public class Game extends Activity implements OnGenericMotionListener, OnTouchLi
private boolean displayedFailureDialog = false; private boolean displayedFailureDialog = false;
public static final String PREFS_FILE_NAME = "gameprefs"; public static final String PREFS_FILE_NAME = "gameprefs";
public static final String QUALITY_PREF_STRING = "Quality"; public static final String QUALITY_PREF_STRING = "Quality";
public static final String WIDTH_PREF_STRING = "Width";
public static final String HEIGHT_PREF_STRING = "Height";
public static final String REFRESH_RATE_PREF_STRING = "RefreshRate";
public static final int DEFAULT_WIDTH = 1280;
public static final int DEFAULT_HEIGHT = 720;
public static final int DEFAULT_REFRESH_RATE = 30;
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
@ -69,8 +78,8 @@ public class Game extends Activity implements OnGenericMotionListener, OnTouchLi
SurfaceView sv = (SurfaceView) findViewById(R.id.surfaceView); SurfaceView sv = (SurfaceView) findViewById(R.id.surfaceView);
sv.setOnGenericMotionListener(this); sv.setOnGenericMotionListener(this);
sv.setOnTouchListener(this); sv.setOnTouchListener(this);
SurfaceHolder sh = sv.getHolder(); SurfaceHolder sh = sv.getHolder();
sh.setFixedSize(1280, 720);
sh.setFormat(PixelFormat.RGBX_8888); sh.setFormat(PixelFormat.RGBX_8888);
// Start the spinner // Start the spinner
@ -82,12 +91,18 @@ public class Game extends Activity implements OnGenericMotionListener, OnTouchLi
if (prefs.getBoolean(QUALITY_PREF_STRING, false)) { if (prefs.getBoolean(QUALITY_PREF_STRING, false)) {
drFlags |= VideoDecoderRenderer.FLAG_PREFER_QUALITY; drFlags |= VideoDecoderRenderer.FLAG_PREFER_QUALITY;
} }
int width, height, refreshRate;
width = prefs.getInt(WIDTH_PREF_STRING, DEFAULT_WIDTH);
height = prefs.getInt(HEIGHT_PREF_STRING, DEFAULT_HEIGHT);
refreshRate = prefs.getInt(REFRESH_RATE_PREF_STRING, DEFAULT_REFRESH_RATE);
sh.setFixedSize(width, height);
// Warn the user if they're on a metered connection // Warn the user if they're on a metered connection
checkDataConnection(); checkDataConnection();
// Start the connection // Start the connection
conn = new NvConnection(Game.this.getIntent().getStringExtra("host"), Game.this); conn = new NvConnection(Game.this.getIntent().getStringExtra("host"), Game.this,
new StreamConfiguration(width, height, refreshRate));
conn.start(PlatformBinding.getDeviceName(), sv.getHolder(), drFlags, conn.start(PlatformBinding.getDeviceName(), sv.getHolder(), drFlags,
PlatformBinding.getAudioRenderer(), PlatformBinding.chooseDecoderRenderer()); PlatformBinding.getAudioRenderer(), PlatformBinding.chooseDecoderRenderer());
} }
@ -277,7 +292,7 @@ public class Game extends Activity implements OnGenericMotionListener, OnTouchLi
// We haven't moved so send a click // We haven't moved so send a click
// Lower the mouse button // Lower the mouse button
conn.sendMouseButtonDown(); conn.sendMouseButtonDown((byte) 0x01);
// We need to sleep a bit here because some games // We need to sleep a bit here because some games
// do input detection by polling // do input detection by polling
@ -286,7 +301,7 @@ public class Game extends Activity implements OnGenericMotionListener, OnTouchLi
} catch (InterruptedException e) {} } catch (InterruptedException e) {}
// Raise the mouse button // Raise the mouse button
conn.sendMouseButtonUp(); conn.sendMouseButtonUp((byte) 0x01);
} }
} }
@ -335,10 +350,10 @@ public class Game extends Activity implements OnGenericMotionListener, OnTouchLi
switch (event.getActionMasked()) switch (event.getActionMasked())
{ {
case MotionEvent.ACTION_DOWN: case MotionEvent.ACTION_DOWN:
conn.sendMouseButtonDown(); conn.sendMouseButtonDown((byte) 0x01);
break; break;
case MotionEvent.ACTION_UP: case MotionEvent.ACTION_UP:
conn.sendMouseButtonUp(); conn.sendMouseButtonUp((byte) 0x01);
break; break;
default: default:
return super.onTouchEvent(event); return super.onTouchEvent(event);