Skip to content
This repository was archived by the owner on May 28, 2022. It is now read-only.
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: Freeseer/freeseer
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: bfd13fe214e5e2477ff578003210c8871bf7aef9
Choose a base ref
..
head repository: Freeseer/freeseer
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: a10ea7bf028e60c1492fb03c05e02aa2da2e7bb2
Choose a head ref
3 changes: 2 additions & 1 deletion src/freeseer/frontend/qtcommon/log.py
Original file line number Diff line number Diff line change
@@ -253,7 +253,7 @@ def emit(self, record):
and Send it to all listeners by calling their message() method"""
self.format(record)
message = {
"message": record.msg % record.args,
"message": record.message,
"level": record.levelname,
"levelno": record.levelno,
"time": record.asctime,
@@ -332,6 +332,7 @@ def message(self, message):
self.icon.setToolTip(self.error_string)

self.label.setText(message["message"])
self.last_message_level = level

def retranslate(self):
self.okay_string = self.app.translate("LogStatusWidget", "Okay")
11 changes: 10 additions & 1 deletion src/freeseer/plugins/audioinput/pulsesrc/__init__.py
Original file line number Diff line number Diff line change
@@ -60,9 +60,18 @@ def get_sources():
return zip(names, names)


def get_default_source():
"""Returns the default audio source."""
sources = get_sources()
if not sources:
return ''
else:
return sources[0][0]


class PulseSrcConfig(Config):
"""Default PulseSrc config settings."""
source = options.StringOption('')
source = options.StringOption(get_default_source())


class PulseSrc(IAudioInput):
10 changes: 9 additions & 1 deletion src/freeseer/plugins/videoinput/firewiresrc/__init__.py
Original file line number Diff line number Diff line change
@@ -65,9 +65,17 @@ def detect_devices():
return device_list


def get_default_device():
"""Returns a default recording device from get_devices()."""
devices = detect_devices()
if not devices:
return ''
return devices[0]


class FirewireSrcConfig(Config):
"""Config settings for Firewire video source."""
device = options.StringOption('')
device = options.StringOption(get_default_device())


class FirewireSrc(IVideoInput):
11 changes: 10 additions & 1 deletion src/freeseer/plugins/videoinput/usbsrc/__init__.py
Original file line number Diff line number Diff line change
@@ -85,9 +85,18 @@ def get_devices():
return devicemap


def get_default_device():
"""Returns a default recording device from get_devices()."""
devicemap = get_devices()
if not devicemap:
return ''
default = devicemap.itervalues().next()
return default


class USBSrcConfig(Config):
"""USBSrc Configuration settings."""
device = options.StringOption('')
device = options.StringOption(get_default_device())


class USBSrc(IVideoInput):