* Main.cs:
* MainWindow.cs: * gui.stetic: * DMX2.MainWindow.cs: Suppression des reférences à aconnectgui (on peux dire qu'on en a plus besoin, là). * AlsaSeqLib.cs: * DriverBoitierV2.cs: * AlsaSeqLib.Wrappers.cs: Suppression des alertes de compilation.
This commit is contained in:
parent
4a183e0a8a
commit
7193d20876
7 changed files with 7 additions and 53 deletions
|
|
@ -76,10 +76,7 @@ namespace DMX2
|
||||||
ptr,
|
ptr,
|
||||||
typeof(snd_seq_addr_t)
|
typeof(snd_seq_addr_t)
|
||||||
);
|
);
|
||||||
} catch (Exception e) {
|
} catch {
|
||||||
#if DEBUG
|
|
||||||
Console.WriteLine (e.Message);
|
|
||||||
#endif
|
|
||||||
return new snd_seq_addr_t ();
|
return new snd_seq_addr_t ();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -59,11 +59,6 @@ namespace DMX2
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public override bool Equals (object obj)
|
|
||||||
{
|
|
||||||
return ((Client)obj).id == id;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public static int ClientId {
|
public static int ClientId {
|
||||||
|
|
|
||||||
|
|
@ -151,11 +151,14 @@ namespace DMX2
|
||||||
etat = etatAutomate.Deconnecte;
|
etat = etatAutomate.Deconnecte;
|
||||||
}
|
}
|
||||||
|
|
||||||
} catch (Exception ex) {
|
}
|
||||||
etat = etatAutomate.Deconnecte;
|
|
||||||
#if DEBUG
|
#if DEBUG
|
||||||
|
catch (Exception ex) {
|
||||||
Console.WriteLine("DriverV2:Connection : {0}",ex);
|
Console.WriteLine("DriverV2:Connection : {0}",ex);
|
||||||
|
#else
|
||||||
|
catch {
|
||||||
#endif
|
#endif
|
||||||
|
etat = etatAutomate.Deconnecte;
|
||||||
Thread.Sleep (500);
|
Thread.Sleep (500);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -25,7 +25,7 @@ namespace DMX2
|
||||||
{
|
{
|
||||||
public static void Main (string[] args)
|
public static void Main (string[] args)
|
||||||
{
|
{
|
||||||
bool fullscreen = false, aguibtn = false;
|
bool fullscreen = false;
|
||||||
WebServer ws = null; bool webserv = false;
|
WebServer ws = null; bool webserv = false;
|
||||||
System.IO.FileInfo openfile=null;
|
System.IO.FileInfo openfile=null;
|
||||||
|
|
||||||
|
|
@ -37,9 +37,6 @@ namespace DMX2
|
||||||
case "fs":
|
case "fs":
|
||||||
fullscreen = true;
|
fullscreen = true;
|
||||||
break;
|
break;
|
||||||
case "aguibtn":
|
|
||||||
aguibtn=true;
|
|
||||||
break;
|
|
||||||
case "ws":
|
case "ws":
|
||||||
webserv = true;
|
webserv = true;
|
||||||
break;
|
break;
|
||||||
|
|
@ -74,7 +71,6 @@ namespace DMX2
|
||||||
MainWindow win = new MainWindow ();
|
MainWindow win = new MainWindow ();
|
||||||
// application des options
|
// application des options
|
||||||
if(fullscreen) win.ToggleFullscreen();
|
if(fullscreen) win.ToggleFullscreen();
|
||||||
if(aguibtn) win.AfficheBoutonACGUI();
|
|
||||||
|
|
||||||
if (openfile!=null) win.OpenFile(openfile);
|
if (openfile!=null) win.OpenFile(openfile);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -739,24 +739,6 @@ namespace DMX2
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void AfficheBoutonACGUI ()
|
|
||||||
{
|
|
||||||
aguiAction.VisibleHorizontal = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
Process aguiprocess= null;
|
|
||||||
|
|
||||||
protected void OnInfoActionActivated (object sender, EventArgs e)
|
|
||||||
{
|
|
||||||
/*if(aguiprocess!=null)
|
|
||||||
if(!aguiprocess.HasExited)
|
|
||||||
return;
|
|
||||||
|
|
||||||
aguiprocess= Process.Start("aconnectgui");*/
|
|
||||||
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
protected void OnAboutActionActivated (object sender, EventArgs e)
|
protected void OnAboutActionActivated (object sender, EventArgs e)
|
||||||
{
|
{
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -23,7 +23,6 @@ namespace DMX2
|
||||||
private global::Gtk.Action connectAction;
|
private global::Gtk.Action connectAction;
|
||||||
private global::Gtk.Action seqMacroAction;
|
private global::Gtk.Action seqMacroAction;
|
||||||
private global::Gtk.Action selectColorAction;
|
private global::Gtk.Action selectColorAction;
|
||||||
private global::Gtk.Action aguiAction;
|
|
||||||
private global::Gtk.Action aboutAction;
|
private global::Gtk.Action aboutAction;
|
||||||
private global::Gtk.Action midiAction;
|
private global::Gtk.Action midiAction;
|
||||||
private global::Gtk.Action connectAction1;
|
private global::Gtk.Action connectAction1;
|
||||||
|
|
@ -119,12 +118,6 @@ namespace DMX2
|
||||||
w1.Add (this.seqMacroAction, null);
|
w1.Add (this.seqMacroAction, null);
|
||||||
this.selectColorAction = new global::Gtk.Action ("selectColorAction", null, "Recharger le theme", "gtk-select-color");
|
this.selectColorAction = new global::Gtk.Action ("selectColorAction", null, "Recharger le theme", "gtk-select-color");
|
||||||
w1.Add (this.selectColorAction, null);
|
w1.Add (this.selectColorAction, null);
|
||||||
this.aguiAction = new global::Gtk.Action ("aguiAction", null, "Lance AConnectGui", "gtk-info");
|
|
||||||
this.aguiAction.Visible = false;
|
|
||||||
this.aguiAction.VisibleHorizontal = false;
|
|
||||||
this.aguiAction.VisibleVertical = false;
|
|
||||||
this.aguiAction.VisibleOverflown = false;
|
|
||||||
w1.Add (this.aguiAction, null);
|
|
||||||
this.aboutAction = new global::Gtk.Action ("aboutAction", null, null, "gtk-about");
|
this.aboutAction = new global::Gtk.Action ("aboutAction", null, null, "gtk-about");
|
||||||
w1.Add (this.aboutAction, null);
|
w1.Add (this.aboutAction, null);
|
||||||
this.midiAction = new global::Gtk.Action ("midiAction", null, null, "gtk-preferences");
|
this.midiAction = new global::Gtk.Action ("midiAction", null, null, "gtk-preferences");
|
||||||
|
|
@ -506,7 +499,6 @@ namespace DMX2
|
||||||
this.connectAction.Activated += new global::System.EventHandler (this.OnConnectActionActivated);
|
this.connectAction.Activated += new global::System.EventHandler (this.OnConnectActionActivated);
|
||||||
this.seqMacroAction.Activated += new global::System.EventHandler (this.OnSeqMacroActionActivated);
|
this.seqMacroAction.Activated += new global::System.EventHandler (this.OnSeqMacroActionActivated);
|
||||||
this.selectColorAction.Activated += new global::System.EventHandler (this.OnSelectColorActionActivated);
|
this.selectColorAction.Activated += new global::System.EventHandler (this.OnSelectColorActionActivated);
|
||||||
this.aguiAction.Activated += new global::System.EventHandler (this.OnInfoActionActivated);
|
|
||||||
this.aboutAction.Activated += new global::System.EventHandler (this.OnAboutActionActivated);
|
this.aboutAction.Activated += new global::System.EventHandler (this.OnAboutActionActivated);
|
||||||
this.midiAction.Activated += new global::System.EventHandler (this.OnMidiActionActivated);
|
this.midiAction.Activated += new global::System.EventHandler (this.OnMidiActionActivated);
|
||||||
this.selectColorAction1.Activated += new global::System.EventHandler (this.OnSelectColorActionActivated);
|
this.selectColorAction1.Activated += new global::System.EventHandler (this.OnSelectColorActionActivated);
|
||||||
|
|
|
||||||
|
|
@ -197,17 +197,6 @@
|
||||||
<property name="Tooltip" translatable="yes">Recharger le theme</property>
|
<property name="Tooltip" translatable="yes">Recharger le theme</property>
|
||||||
<signal name="Activated" handler="OnSelectColorActionActivated" />
|
<signal name="Activated" handler="OnSelectColorActionActivated" />
|
||||||
</action>
|
</action>
|
||||||
<action id="aguiAction">
|
|
||||||
<property name="Type">Action</property>
|
|
||||||
<property name="Label" translatable="yes" />
|
|
||||||
<property name="StockId">gtk-info</property>
|
|
||||||
<property name="Tooltip" translatable="yes">Lance AConnectGui</property>
|
|
||||||
<property name="Visible">False</property>
|
|
||||||
<property name="VisibleHorizontal">False</property>
|
|
||||||
<property name="VisibleVertical">False</property>
|
|
||||||
<property name="VisibleOverflown">False</property>
|
|
||||||
<signal name="Activated" handler="OnInfoActionActivated" />
|
|
||||||
</action>
|
|
||||||
<action id="aboutAction">
|
<action id="aboutAction">
|
||||||
<property name="Type">Action</property>
|
<property name="Type">Action</property>
|
||||||
<property name="Label" translatable="yes" />
|
<property name="Label" translatable="yes" />
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue