emdee/toxygen
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

device selection in settings

Browse Source
This commit is contained in:
ingvar1995 2017-06-13 22:42:05 +03:00
parent ec6c04a7df
commit 8bc4613407
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
toxygen/calls.py
View File

@ -179,7 +179,7 @@ class AV:
self._video_width = 640 # TODO: use settings self._video_width = 640 # TODO: use settings
self._video_height = 480 self._video_height = 480
self._video = cv2.VideoCapture(0) self._video = cv2.VideoCapture(settings.Settings.get_instance().video['device'])
self._video.set(cv2.CAP_PROP_FPS, 25) self._video.set(cv2.CAP_PROP_FPS, 25)
self._video.set(cv2.CAP_PROP_FRAME_WIDTH, self._video_width) self._video.set(cv2.CAP_PROP_FRAME_WIDTH, self._video_width)
self._video.set(cv2.CAP_PROP_FRAME_HEIGHT, self._video_height) self._video.set(cv2.CAP_PROP_FRAME_HEIGHT, self._video_height)

1
toxygen/mainscreen.py
View File

@ -131,6 +131,7 @@ class MainWindow(QtWidgets.QMainWindow, Singleton):
self.actionAbout_program.setText(QtWidgets.QApplication.translate("MainWindow", "About program")) self.actionAbout_program.setText(QtWidgets.QApplication.translate("MainWindow", "About program"))
self.actionSettings.setText(QtWidgets.QApplication.translate("MainWindow", "Settings")) self.actionSettings.setText(QtWidgets.QApplication.translate("MainWindow", "Settings"))
self.audioSettings.setText(QtWidgets.QApplication.translate("MainWindow", "Audio")) self.audioSettings.setText(QtWidgets.QApplication.translate("MainWindow", "Audio"))
self.videoSettings.setText(QtWidgets.QApplication.translate("MainWindow", "Video"))
self.updateSettings.setText(QtWidgets.QApplication.translate("MainWindow", "Updates")) self.updateSettings.setText(QtWidgets.QApplication.translate("MainWindow", "Updates"))
self.contact_name.setPlaceholderText(QtWidgets.QApplication.translate("MainWindow", "Search")) self.contact_name.setPlaceholderText(QtWidgets.QApplication.translate("MainWindow", "Search"))
self.sendMessageButton.setToolTip(QtWidgets.QApplication.translate("MainWindow", "Send message")) self.sendMessageButton.setToolTip(QtWidgets.QApplication.translate("MainWindow", "Send message"))

4
toxygen/menu.py
View File

@ -823,13 +823,13 @@ class VideoSettings(CenteredWidget):
self.input.setGeometry(QtCore.QRect(25, 30, 350, 30)) self.input.setGeometry(QtCore.QRect(25, 30, 350, 30))
import cv2 import cv2
self.devices = [] self.devices = []
for i in range(15): for i in range(10):
v = cv2.VideoCapture(i) v = cv2.VideoCapture(i)
if v.isOpened(): if v.isOpened():
del v del v
self.devices.append(i) self.devices.append(i)
self.input.addItem('Device #' + str(i)) self.input.addItem('Device #' + str(i))
self.input.setCurrentIndex(self.in_indexes.index(settings.video['device'])) self.input.setCurrentIndex(self.devices.index(settings.video['device']))
def retranslateUi(self): def retranslateUi(self):
self.setWindowTitle(QtWidgets.QApplication.translate("videoSettingsForm", "Video settings")) self.setWindowTitle(QtWidgets.QApplication.translate("videoSettingsForm", "Video settings"))