This commit is contained in:
chi
2025-04-24 16:24:01 +09:00
parent f71b963851
commit 20dd87a9d0
55 changed files with 961 additions and 1085 deletions

View File

@@ -18,7 +18,7 @@ namespace Project
public fSetup()
{
InitializeComponent();
tmDisplay = new Timer
tmDisplay = new System.Windows.Forms.Timer
{
Interval = 200
};
@@ -125,7 +125,7 @@ namespace Project
chkClearPos.Checked = PUB.setting.AutoModeOffAndClearPosition;
//PLC옵션
nudMusicVol.Value = (int)(PUB.mplayer.Volume * 100.0);
nudMusicVol.Value = PUB.setting.musicvol;// (int)(PUB.mplayer.Volume * 100.0);
tbMusic.Text = PUB.setting.musicfile;
this.chkFullScreen.Checked = PUB.setting.FullScreen;
this.chkDetectManualCharge.Checked = PUB.setting.DetectManualCharge;
@@ -332,7 +332,8 @@ namespace Project
PUB.setting.TAGF5B = (int)vcTagF5B.Value;
//PLC옵션
PUB.setting.musicvol = (int)nudMusicVol.Value;
//PUB.setting.musicvol = (int)nudMusicVol.Value;
PUB.SetVolume((int)nudMusicVol.Value);
PUB.setting.ChargeSearchTime = (int)vcChargeSearchTime.Value;
PUB.setting.doorSoundTerm = (int)nudDoorSoundTerm.Value;
@@ -527,8 +528,8 @@ namespace Project
}
try
{
if (PUB.mplayer.HasAudio) PUB.mplayer.Stop();
PUB.mplayer.Open(new Uri(tbMusic.Text));
if (PUB.mplayer.SoundLocation.isEmpty()==false) PUB.mplayer.Stop();
PUB.mplayer.SoundLocation = tbMusic.Text;// (new Uri(tbMusic.Text));
PUB.mplayer.Play();
PUB.bPlayMusic = true;
}