some stuff to put networking back in gfceux
This commit is contained in:
parent
505f609e72
commit
452a4e675e
|
@ -1041,7 +1041,6 @@ Invalid options may cause GFCE UltraX to behave incorrectly.
|
||||||
<child>
|
<child>
|
||||||
<object class="GtkVBox" id="network_vbox">
|
<object class="GtkVBox" id="network_vbox">
|
||||||
<property name="visible">True</property>
|
<property name="visible">True</property>
|
||||||
<property name="sensitive">False</property>
|
|
||||||
<property name="border_width">5</property>
|
<property name="border_width">5</property>
|
||||||
<property name="spacing">5</property>
|
<property name="spacing">5</property>
|
||||||
<child>
|
<child>
|
||||||
|
@ -1285,7 +1284,6 @@ Invalid options may cause GFCE UltraX to behave incorrectly.
|
||||||
</child>
|
</child>
|
||||||
<child type="tab">
|
<child type="tab">
|
||||||
<object class="GtkLabel" id="label13">
|
<object class="GtkLabel" id="label13">
|
||||||
<property name="sensitive">False</property>
|
|
||||||
<property name="label" translatable="yes">Network</property>
|
<property name="label" translatable="yes">Network</property>
|
||||||
</object>
|
</object>
|
||||||
<packing>
|
<packing>
|
||||||
|
|
23
src/main.py
23
src/main.py
|
@ -382,8 +382,7 @@ class GfceuxApp:
|
||||||
network + other_options + options.extra_entry + ' '+ rom_name
|
network + other_options + options.extra_entry + ' '+ rom_name
|
||||||
self.msg('Command: ' + command)
|
self.msg('Command: ' + command)
|
||||||
|
|
||||||
# more code to disable because netplay is fucked
|
|
||||||
"""
|
|
||||||
if options.host_radio:
|
if options.host_radio:
|
||||||
xterm_binary = find_binary("xterm")
|
xterm_binary = find_binary("xterm")
|
||||||
if xterm_binary == None:
|
if xterm_binary == None:
|
||||||
|
@ -398,7 +397,7 @@ class GfceuxApp:
|
||||||
args.append("--password")
|
args.append("--password")
|
||||||
args.append(options.host_pass)
|
args.append(options.host_pass)
|
||||||
pid = Popen(args).pid
|
pid = Popen(args).pid
|
||||||
"""
|
|
||||||
widgets.get_object("main_window").hide()
|
widgets.get_object("main_window").hide()
|
||||||
|
|
||||||
# os.system() is a blocker, so we must force
|
# os.system() is a blocker, so we must force
|
||||||
|
@ -409,11 +408,11 @@ class GfceuxApp:
|
||||||
os.system(command)
|
os.system(command)
|
||||||
widgets.get_object("main_window").show()
|
widgets.get_object("main_window").show()
|
||||||
|
|
||||||
# another part of netplay code
|
|
||||||
"""
|
|
||||||
if options.host_radio:
|
if options.host_radio:
|
||||||
os.kill(pid, 9)
|
os.kill(pid, 9)
|
||||||
"""
|
|
||||||
|
|
||||||
### Callbacks
|
### Callbacks
|
||||||
def launch_button_clicked(self, arg1):
|
def launch_button_clicked(self, arg1):
|
||||||
|
@ -621,18 +620,16 @@ class GfceuxApp:
|
||||||
options.no_network_radio = False
|
options.no_network_radio = False
|
||||||
|
|
||||||
def host_radio_clicked(self, menuitem, data=None):
|
def host_radio_clicked(self, menuitem, data=None):
|
||||||
"""
|
|
||||||
this is broken in fceux right now
|
|
||||||
if widgets.get_object("host_radio").get_active():
|
if widgets.get_object("host_radio").get_active():
|
||||||
self.server_binary = find_binary('fceu-server')
|
self.server_binary = find_binary('fceux-server')
|
||||||
|
|
||||||
if self.server_binary == None:
|
if self.server_binary == None:
|
||||||
if os.name == 'nt':
|
if os.name == 'nt':
|
||||||
self.print_error("The fceu server software cannot be found. \n\
|
self.print_error("The fceux server software cannot be found. \n\
|
||||||
Ensure that it is installed in the same directory as \n\
|
Ensure that it is installed in the same directory as \n\
|
||||||
GFCE Ultra.", 102, True, False)
|
GFCE Ultra.", 102, True, False)
|
||||||
else:
|
else:
|
||||||
self.print_error("The fceu server software cannot be found on \n\
|
self.print_error("The fceux server software cannot be found on \n\
|
||||||
this system. Ensure that it is installed and in your path.",
|
this system. Ensure that it is installed and in your path.",
|
||||||
101, True, False)
|
101, True, False)
|
||||||
widgets.get_object("no_network_radio").set_active(True)
|
widgets.get_object("no_network_radio").set_active(True)
|
||||||
|
@ -644,8 +641,6 @@ class GfceuxApp:
|
||||||
options.join_radio = False
|
options.join_radio = False
|
||||||
options.host_radio = True
|
options.host_radio = True
|
||||||
options.no_network_radio = False
|
options.no_network_radio = False
|
||||||
"""
|
|
||||||
pass
|
|
||||||
|
|
||||||
def no_network_radio_clicked(self, menuitem, data=None):
|
def no_network_radio_clicked(self, menuitem, data=None):
|
||||||
widgets.get_object("join_frame").set_sensitive(False)
|
widgets.get_object("join_frame").set_sensitive(False)
|
||||||
|
|
Loading…
Reference in New Issue