git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@54581 e17a0e51-4ae3-4d35-97c3-1a29b211df97

This commit is contained in:
SND\weimingzhi_cp 2010-07-14 06:58:08 +00:00
parent 3d98503d19
commit 31db690668
3 changed files with 8 additions and 3 deletions

View File

@ -1,3 +1,9 @@
July 14, 2010 Wei Mingzhi <whistler_wmz@users.sf.net>
* plugins/dfcdrom/cdr.h: Silenced warning on macro redefination when using
libcdio with some special configuration.
* plugins/dfsound/spucfg-0.1df/main.c: Set volume to High by default.
July 13, 2010 Wei Mingzhi <whistler_wmz@users.sf.net>
* libpcsxcore/socket.c: Fixed FTBFS on Windows.

View File

@ -74,9 +74,8 @@ struct cdrom_msf {
#define CD_SECS 60
#define CD_FRAMES 75
#define CD_FRAMESIZE_RAW 2352
#define CD_FRAMESIZE_SUB 96
#define CD_MSF_OFFSET 150
#define CD_FRAMESIZE_SUB 96
#if defined (__FreeBSD__)
#define DEV_DEF "/dev/acd0"

View File

@ -127,7 +127,7 @@ int main(int argc, char *argv[])
len = 1;
}
val = set_limit (p, len, 0, 4);
} else val = 1;
} else val = 2;
gtk_combo_box_set_active(GTK_COMBO_BOX (glade_xml_get_widget(xml, "cbVolume2")), val);