Skip to content

Placeshifter fix for windows #501

New issue

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

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Narflex merged 1 commit into from
May 19, 2025
Merged

Placeshifter fix for windows #501

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@

## Next

## Version 9.2.12 (2025-05-18)
* Fix for placeshifter on windows (also added optional logging)

## Version 9.2.11 (2025-05-15)
* SD EPG changes to correct non-syncronized method causing use of old tokens

Expand Down
2 changes: 1 addition & 1 deletion java/sage/Version.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public class Version
{
public static final byte MAJOR_VERSION = 9;
public static final byte MINOR_VERSION = 2;
public static final byte MICRO_VERSION = 11;
public static final byte MICRO_VERSION = 12;

public static final String VERSION = MAJOR_VERSION + "." + MINOR_VERSION + "." + MICRO_VERSION + "." + SageConstants.BUILD_VERSION;

Expand Down
6 changes: 4 additions & 2 deletions java/sage/miniclient/DirectX9GFXCMD.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
*/
package sage.miniclient;

import java.nio.Buffer;

/**
*
* @author Narflex
Expand Down Expand Up @@ -1227,7 +1229,7 @@ else if (nativeDiffPtr == null)
{
ImageLoadData ild = new ImageLoadData();
ild.imageLoadBuff = java.nio.ByteBuffer.allocateDirect(width * height * 4);
ild.imageLoadBuff.clear();
((Buffer)ild.imageLoadBuff).clear();
ild.imageLoadBuffHandle = imghandle;
ild.imageLoadBuffSize = new java.awt.Dimension(width, height);
imageLoadBuffMap.put(new Integer(imghandle), ild);
Expand Down Expand Up @@ -1268,7 +1270,7 @@ else if (nativeDiffPtr == null)
}
ImageLoadData ild = new ImageLoadData();
ild.imageLoadBuff = java.nio.ByteBuffer.allocateDirect(width * height * 4);
ild.imageLoadBuff.clear();
((Buffer)ild.imageLoadBuff).clear();
ild.imageLoadBuffHandle = imghandle;
ild.imageLoadBuffSize = new java.awt.Dimension(width, height);
imageLoadBuffMap.put(new Integer(imghandle), ild);
Expand Down
22 changes: 20 additions & 2 deletions java/sage/miniclient/MiniClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,11 @@
*/
package sage.miniclient;

import java.io.BufferedOutputStream;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.PrintStream;

public class MiniClient
{
public static boolean WINDOWS_OS = false;
Expand All @@ -24,6 +29,7 @@ public class MiniClient
public static boolean fsStartup = false;
public static Integer irKillCode = null;
public static final String BYTE_CHARSET = "ISO8859_1";
public static final String redirectLogProp = "write_output_to_miniClient_log";
static
{
System.out.println("Starting MiniClient");
Expand Down Expand Up @@ -145,6 +151,8 @@ public static void startup(String[] args)
if(MAC_OS_X) myProperties.setProperty("opengl", "true");
}

java.io.File redirectLog = new java.io.File(configDir, "miniClient.log");

java.io.PrintStream redir = null;
redir = new java.io.PrintStream(new java.io.OutputStream()
{
Expand All @@ -158,8 +166,18 @@ public synchronized void println(String s)
}
};

System.setOut(redir);
//System.setErr(redir);
if (myProperties.getProperty(redirectLogProp, "false").equalsIgnoreCase("true")){
try {
PrintStream printStream = new PrintStream(new BufferedOutputStream(new FileOutputStream(redirectLog)),true);
System.setOut(printStream);
System.setErr(printStream);
} catch (FileNotFoundException ex) {
ex.printStackTrace();
}
}else{
System.setOut(redir);
}

mainArgs = args;
boolean noretries = false;
for (int i = 0; args != null && i < args.length; i++)
Expand Down